diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 7eab6fda..47f3de94 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -24,6 +24,7 @@ rule check-icu-config ( )
          gHAS_ICU = true ;
          gICU_CORE_LIB = icuuc ;
          gICU_IN_LIB = icui18n ;
+         gICU_DATA_LIB = icudata ;
          gICU_CONFIG_CHECKED = true ;
       }
       else if $(ICU_PATH)
@@ -53,17 +54,10 @@ rule check-icu-config ( )
             {
                gICU_CORE_LIB = icuuc ;
             }
-            else if [ GLOB $(dir)/lib : libicuuc.* ]
-            {
-               gICU_CORE_LIB = icuuc ;
-            }
-            else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ]
+            else if [ GLOB $(ICU_PATH)/lib : cygicuuc*.dll ]
             {
                gICU_CORE_LIB = cygicuuc.dll ;
-            }
-            else if [ GLOB $(ICU_PATH)/lib : cygicuuc32.dll ]
-            {
-               gICU_CORE_LIB = cygicuuc32.dll ;
+               gICU_CYGWIN = true ;
             }
             else
             {
@@ -92,13 +86,10 @@ rule check-icu-config ( )
             {
                gICU_IN_LIB = icui18n ;
             }
-            else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ]
+            else if [ GLOB $(ICU_PATH)/lib : cygicuin*.dll ]
             {
                gICU_IN_LIB = cygicuin.dll ;
-            }
-            else if [ GLOB $(ICU_PATH)/lib : cygicuin32.dll ]
-            {
-               gICU_IN_LIB = cygicuin32.dll ;
+               gICU_CYGWIN = true ;
             }
             else
             {
@@ -109,8 +100,54 @@ rule check-icu-config ( )
                ECHO          Defaulting to look for libicui18n ... ;
                gICU_IN_LIB = icui18n ;
             }
+#Added by Tommy Nordgren - libicudata muct be linked against on Mac OS X            
+            if $(ICU_LINK)
+            {
+               # nothing to do, it's already been done!
+               # gICU_LIBS += <linkflags>$(ICU_LINK) ;
+            }
+            else if [ GLOB $(dir)/lib64 : icudt.* ]
+            {
+               gICU_DATA_LIB = icudt ;
+            }
+            else if [ GLOB $(dir)/lib : icudt.* ]
+            {
+               gICU_DATA_LIB = icudt ;
+            }
+            else if [ GLOB $(dir)/lib : libicudata.* ]
+            {
+               gICU_DATA_LIB = icudata ;
+            }
+            else if [ GLOB $(ICU_PATH)/lib : cygicudt*.dll ]
+            {
+               gICU_DATA_LIB = cygicudt.dll ;
+               gICU_CYGWIN = true ;
+            }
+            else
+            {
+               local os = [ modules.peek : OS ] ;
+               echo $(os) ;
+               if $(os) != "DARWIN"
+               {
+                  ECHO WARNING: ICU shared data library not found in path. ;
+                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO          with the environment variable ICU_LINK set to contain ;
+                  ECHO          the linker options required to link to ICU. ;
+               }
+               else
+               {
+                  ECHO WARNING: ICU shared data library not found in path. ;
+                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO          with the environment variable ICU_LINK set to contain ;
+                  ECHO          the linker options required to link to ICU. ;
+                  ECHO          Defaulting to look for libicudata ... ;
+                  gICU_DATA_LIB = icudata ;
+               }
+            }
+#End of addition by Tommy Nordgren
          }
       }
+
       gICU_CONFIG_CHECKED = true ;
    }
    
@@ -143,15 +180,36 @@ if [ check-icu-config ]
       }
    }
    
-   if $(gICU_CORE_LIB)
+   if $(gICU_CYGWIN)
    {
-      lib icucore : : <name>$(gICU_CORE_LIB) $(ICU_SEARCH_OPTS) ;
-      ICU_EXTRA_SOURCE = icucore ;
+      if $(gICU_CORE_LIB)
+      {
+         BOOST_REGEX_ICU_OPTS  += "<linkflags>$(gICU_CORE_LIB) ;
+      }
+      if $(gICU_IN_LIB)
+      {
+         BOOST_REGEX_ICU_OPTS  += "<linkflags>$(gICU_IN_LIB) ;
+      }
    }
-   if $(gICU_IN_LIB)
+   else
    {
-      lib icuin : : <name>$(gICU_IN_LIB) $(ICU_SEARCH_OPTS) ;
-      ICU_EXTRA_SOURCE += icuin ;
+      if $(gICU_CORE_LIB)
+      {
+         lib icucore : : <name>$(gICU_CORE_LIB) $(ICU_SEARCH_OPTS) <link>shared ;
+         ICU_EXTRA_SOURCE = icucore ;
+      }
+      if $(gICU_IN_LIB)
+      {
+         lib icuin : : <name>$(gICU_IN_LIB) $(ICU_SEARCH_OPTS) <link>shared ;
+         ICU_EXTRA_SOURCE += icuin ;
+      }
+#Added by Tommy Nordgren libicudata must be linked against on Mac OS X
+      if $(gICU_DATA_LIB)
+      {
+         lib icudata : : <name>$(gICU_DATA_LIB) $(ICU_SEARCH_OPTS) <link>shared ;
+         ICU_EXTRA_SOURCE += icudata ;
+      }
+#End of addition by Tommy Nordgren
    }
 }
 
@@ -186,6 +244,14 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
 	     $(BOOST_REGEX_ICU_OPTS)
     ;
 
+alias icu_options : $(ICU_EXTRA_SOURCE) : : : $(BOOST_REGEX_ICU_OPTS) ;
+
+boost-install boost_regex ;
+
+
+
+
+
 
 
 
diff --git a/build/bcb6.mak b/build/bcb6.mak
index d7ca7e1f..12526451 100644
--- a/build/bcb6.mak
+++ b/build/bcb6.mak
@@ -39,33 +39,33 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : bcb bcb\libboost_regex-bcb-s-1_34 bcb\libboost_regex-bcb-s-1_34.lib bcb\libboost_regex-bcb-mt-s-1_34 bcb\libboost_regex-bcb-mt-s-1_34.lib bcb\boost_regex-bcb-mt-1_34 bcb\boost_regex-bcb-mt-1_34.lib bcb\boost_regex-bcb-1_34 bcb\boost_regex-bcb-1_34.lib bcb\libboost_regex-bcb-mt-1_34 bcb\libboost_regex-bcb-mt-1_34.lib bcb\libboost_regex-bcb-1_34 bcb\libboost_regex-bcb-1_34.lib bcb\libboost_regex-bcb-sd-1_34 bcb\libboost_regex-bcb-sd-1_34.lib bcb\libboost_regex-bcb-mt-sd-1_34 bcb\libboost_regex-bcb-mt-sd-1_34.lib bcb\boost_regex-bcb-mt-d-1_34 bcb\boost_regex-bcb-mt-d-1_34.lib bcb\boost_regex-bcb-d-1_34 bcb\boost_regex-bcb-d-1_34.lib bcb\libboost_regex-bcb-mt-d-1_34 bcb\libboost_regex-bcb-mt-d-1_34.lib bcb\libboost_regex-bcb-d-1_34 bcb\libboost_regex-bcb-d-1_34.lib
+all : bcb bcb\libboost_regex-bcb-s-1_35 bcb\libboost_regex-bcb-s-1_35.lib bcb\libboost_regex-bcb-mt-s-1_35 bcb\libboost_regex-bcb-mt-s-1_35.lib bcb\boost_regex-bcb-mt-1_35 bcb\boost_regex-bcb-mt-1_35.lib bcb\boost_regex-bcb-1_35 bcb\boost_regex-bcb-1_35.lib bcb\libboost_regex-bcb-mt-1_35 bcb\libboost_regex-bcb-mt-1_35.lib bcb\libboost_regex-bcb-1_35 bcb\libboost_regex-bcb-1_35.lib bcb\libboost_regex-bcb-sd-1_35 bcb\libboost_regex-bcb-sd-1_35.lib bcb\libboost_regex-bcb-mt-sd-1_35 bcb\libboost_regex-bcb-mt-sd-1_35.lib bcb\boost_regex-bcb-mt-d-1_35 bcb\boost_regex-bcb-mt-d-1_35.lib bcb\boost_regex-bcb-d-1_35 bcb\boost_regex-bcb-d-1_35.lib bcb\libboost_regex-bcb-mt-d-1_35 bcb\libboost_regex-bcb-mt-d-1_35.lib bcb\libboost_regex-bcb-d-1_35 bcb\libboost_regex-bcb-d-1_35.lib
 
-clean :  libboost_regex-bcb-s-1_34_clean libboost_regex-bcb-mt-s-1_34_clean boost_regex-bcb-mt-1_34_clean boost_regex-bcb-1_34_clean libboost_regex-bcb-mt-1_34_clean libboost_regex-bcb-1_34_clean libboost_regex-bcb-sd-1_34_clean libboost_regex-bcb-mt-sd-1_34_clean boost_regex-bcb-mt-d-1_34_clean boost_regex-bcb-d-1_34_clean libboost_regex-bcb-mt-d-1_34_clean libboost_regex-bcb-d-1_34_clean
+clean :  libboost_regex-bcb-s-1_35_clean libboost_regex-bcb-mt-s-1_35_clean boost_regex-bcb-mt-1_35_clean boost_regex-bcb-1_35_clean libboost_regex-bcb-mt-1_35_clean libboost_regex-bcb-1_35_clean libboost_regex-bcb-sd-1_35_clean libboost_regex-bcb-mt-sd-1_35_clean boost_regex-bcb-mt-d-1_35_clean boost_regex-bcb-d-1_35_clean libboost_regex-bcb-mt-d-1_35_clean libboost_regex-bcb-d-1_35_clean
 
 install : all
-	copy bcb\libboost_regex-bcb-s-1_34.lib $(BCROOT)\lib
-	copy bcb\libboost_regex-bcb-mt-s-1_34.lib $(BCROOT)\lib
-	copy bcb\boost_regex-bcb-mt-1_34.lib $(BCROOT)\lib
-	copy bcb\boost_regex-bcb-mt-1_34.dll $(BCROOT)\bin
-	copy bcb\boost_regex-bcb-mt-1_34.tds $(BCROOT)\bin
-	copy bcb\boost_regex-bcb-1_34.lib $(BCROOT)\lib
-	copy bcb\boost_regex-bcb-1_34.dll $(BCROOT)\bin
-	copy bcb\boost_regex-bcb-1_34.tds $(BCROOT)\bin
-	copy bcb\libboost_regex-bcb-mt-1_34.lib $(BCROOT)\lib
-	copy bcb\libboost_regex-bcb-1_34.lib $(BCROOT)\lib
-	copy bcb\libboost_regex-bcb-sd-1_34.lib $(BCROOT)\lib
-	copy bcb\libboost_regex-bcb-mt-sd-1_34.lib $(BCROOT)\lib
-	copy bcb\boost_regex-bcb-mt-d-1_34.lib $(BCROOT)\lib
-	copy bcb\boost_regex-bcb-mt-d-1_34.dll $(BCROOT)\bin
-	copy bcb\boost_regex-bcb-mt-d-1_34.tds $(BCROOT)\bin
-	copy bcb\boost_regex-bcb-d-1_34.lib $(BCROOT)\lib
-	copy bcb\boost_regex-bcb-d-1_34.dll $(BCROOT)\bin
-	copy bcb\boost_regex-bcb-d-1_34.tds $(BCROOT)\bin
-	copy bcb\libboost_regex-bcb-mt-d-1_34.lib $(BCROOT)\lib
-	copy bcb\libboost_regex-bcb-d-1_34.lib $(BCROOT)\lib
+	copy bcb\libboost_regex-bcb-s-1_35.lib $(BCROOT)\lib
+	copy bcb\libboost_regex-bcb-mt-s-1_35.lib $(BCROOT)\lib
+	copy bcb\boost_regex-bcb-mt-1_35.lib $(BCROOT)\lib
+	copy bcb\boost_regex-bcb-mt-1_35.dll $(BCROOT)\bin
+	copy bcb\boost_regex-bcb-mt-1_35.tds $(BCROOT)\bin
+	copy bcb\boost_regex-bcb-1_35.lib $(BCROOT)\lib
+	copy bcb\boost_regex-bcb-1_35.dll $(BCROOT)\bin
+	copy bcb\boost_regex-bcb-1_35.tds $(BCROOT)\bin
+	copy bcb\libboost_regex-bcb-mt-1_35.lib $(BCROOT)\lib
+	copy bcb\libboost_regex-bcb-1_35.lib $(BCROOT)\lib
+	copy bcb\libboost_regex-bcb-sd-1_35.lib $(BCROOT)\lib
+	copy bcb\libboost_regex-bcb-mt-sd-1_35.lib $(BCROOT)\lib
+	copy bcb\boost_regex-bcb-mt-d-1_35.lib $(BCROOT)\lib
+	copy bcb\boost_regex-bcb-mt-d-1_35.dll $(BCROOT)\bin
+	copy bcb\boost_regex-bcb-mt-d-1_35.tds $(BCROOT)\bin
+	copy bcb\boost_regex-bcb-d-1_35.lib $(BCROOT)\lib
+	copy bcb\boost_regex-bcb-d-1_35.dll $(BCROOT)\bin
+	copy bcb\boost_regex-bcb-d-1_35.tds $(BCROOT)\bin
+	copy bcb\libboost_regex-bcb-mt-d-1_35.lib $(BCROOT)\lib
+	copy bcb\libboost_regex-bcb-d-1_35.lib $(BCROOT)\lib
 
 bcb :
 	-@mkdir bcb
@@ -73,1265 +73,1265 @@ bcb :
 
 ########################################################
 #
-# section for libboost_regex-bcb-s-1_34.lib
+# section for libboost_regex-bcb-s-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-s-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-s-1_34
+bcb\libboost_regex-bcb-s-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-s-1_35
 
-libboost_regex-bcb-s-1_34_clean :
-	del bcb\libboost_regex-bcb-s-1_34\*.obj
-	del bcb\libboost_regex-bcb-s-1_34\*.il?
-	del bcb\libboost_regex-bcb-s-1_34\*.csm
-	del bcb\libboost_regex-bcb-s-1_34\*.tds
+libboost_regex-bcb-s-1_35_clean :
+	del bcb\libboost_regex-bcb-s-1_35\*.obj
+	del bcb\libboost_regex-bcb-s-1_35\*.il?
+	del bcb\libboost_regex-bcb-s-1_35\*.csm
+	del bcb\libboost_regex-bcb-s-1_35\*.tds
 
-bcb\libboost_regex-bcb-s-1_34.lib : bcb\libboost_regex-bcb-s-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_34\cregex.obj bcb\libboost_regex-bcb-s-1_34\fileiter.obj bcb\libboost_regex-bcb-s-1_34\icu.obj bcb\libboost_regex-bcb-s-1_34\instances.obj bcb\libboost_regex-bcb-s-1_34\posix_api.obj bcb\libboost_regex-bcb-s-1_34\regex.obj bcb\libboost_regex-bcb-s-1_34\regex_debug.obj bcb\libboost_regex-bcb-s-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-s-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-s-1_34\static_mutex.obj bcb\libboost_regex-bcb-s-1_34\usinstances.obj bcb\libboost_regex-bcb-s-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-s-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-s-1_34.lib del bcb\libboost_regex-bcb-s-1_34.lib 
+bcb\libboost_regex-bcb-s-1_35.lib : bcb\libboost_regex-bcb-s-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_35\cregex.obj bcb\libboost_regex-bcb-s-1_35\fileiter.obj bcb\libboost_regex-bcb-s-1_35\icu.obj bcb\libboost_regex-bcb-s-1_35\instances.obj bcb\libboost_regex-bcb-s-1_35\posix_api.obj bcb\libboost_regex-bcb-s-1_35\regex.obj bcb\libboost_regex-bcb-s-1_35\regex_debug.obj bcb\libboost_regex-bcb-s-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-s-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-s-1_35\static_mutex.obj bcb\libboost_regex-bcb-s-1_35\usinstances.obj bcb\libboost_regex-bcb-s-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-s-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-s-1_35.lib del bcb\libboost_regex-bcb-s-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_34.lib"  +"bcb\libboost_regex-bcb-s-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_34\cregex.obj" +"bcb\libboost_regex-bcb-s-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_34\icu.obj" +"bcb\libboost_regex-bcb-s-1_34\instances.obj" +"bcb\libboost_regex-bcb-s-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_34\regex.obj" +"bcb\libboost_regex-bcb-s-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-s-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-s-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-s-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-s-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_35.lib"  +"bcb\libboost_regex-bcb-s-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_35\cregex.obj" +"bcb\libboost_regex-bcb-s-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_35\icu.obj" +"bcb\libboost_regex-bcb-s-1_35\instances.obj" +"bcb\libboost_regex-bcb-s-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_35\regex.obj" +"bcb\libboost_regex-bcb-s-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-s-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-s-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-s-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-s-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_35\winstances.obj"
 |
 
 ########################################################
 #
-# section for libboost_regex-bcb-mt-s-1_34.lib
+# section for libboost_regex-bcb-mt-s-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-mt-s-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-mt-s-1_34
+bcb\libboost_regex-bcb-mt-s-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-mt-s-1_35
 
-libboost_regex-bcb-mt-s-1_34_clean :
-	del bcb\libboost_regex-bcb-mt-s-1_34\*.obj
-	del bcb\libboost_regex-bcb-mt-s-1_34\*.il?
-	del bcb\libboost_regex-bcb-mt-s-1_34\*.csm
-	del bcb\libboost_regex-bcb-mt-s-1_34\*.tds
+libboost_regex-bcb-mt-s-1_35_clean :
+	del bcb\libboost_regex-bcb-mt-s-1_35\*.obj
+	del bcb\libboost_regex-bcb-mt-s-1_35\*.il?
+	del bcb\libboost_regex-bcb-mt-s-1_35\*.csm
+	del bcb\libboost_regex-bcb-mt-s-1_35\*.tds
 
-bcb\libboost_regex-bcb-mt-s-1_34.lib : bcb\libboost_regex-bcb-mt-s-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_34\cregex.obj bcb\libboost_regex-bcb-mt-s-1_34\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_34\icu.obj bcb\libboost_regex-bcb-mt-s-1_34\instances.obj bcb\libboost_regex-bcb-mt-s-1_34\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_34\regex.obj bcb\libboost_regex-bcb-mt-s-1_34\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-s-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-s-1_34\static_mutex.obj bcb\libboost_regex-bcb-mt-s-1_34\usinstances.obj bcb\libboost_regex-bcb-mt-s-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-mt-s-1_34.lib del bcb\libboost_regex-bcb-mt-s-1_34.lib 
+bcb\libboost_regex-bcb-mt-s-1_35.lib : bcb\libboost_regex-bcb-mt-s-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_35\cregex.obj bcb\libboost_regex-bcb-mt-s-1_35\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_35\icu.obj bcb\libboost_regex-bcb-mt-s-1_35\instances.obj bcb\libboost_regex-bcb-mt-s-1_35\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_35\regex.obj bcb\libboost_regex-bcb-mt-s-1_35\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-s-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-s-1_35\static_mutex.obj bcb\libboost_regex-bcb-mt-s-1_35\usinstances.obj bcb\libboost_regex-bcb-mt-s-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-mt-s-1_35.lib del bcb\libboost_regex-bcb-mt-s-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_34.lib"  +"bcb\libboost_regex-bcb-mt-s-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\icu.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_35.lib"  +"bcb\libboost_regex-bcb-mt-s-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\icu.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_35\winstances.obj"
 |
 
 ########################################################
 #
-# section for boost_regex-bcb-mt-1_34.lib
+# section for boost_regex-bcb-mt-1_35.lib
 #
 ########################################################
-bcb\boost_regex-bcb-mt-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_34 :
-	-@mkdir bcb\boost_regex-bcb-mt-1_34
+bcb\boost_regex-bcb-mt-1_35 :
+	-@mkdir bcb\boost_regex-bcb-mt-1_35
 
-boost_regex-bcb-mt-1_34_clean :
-	del bcb\boost_regex-bcb-mt-1_34\*.obj
-	del bcb\boost_regex-bcb-mt-1_34\*.il?
-	del bcb\boost_regex-bcb-mt-1_34\*.csm
-	del bcb\boost_regex-bcb-mt-1_34\*.tds
+boost_regex-bcb-mt-1_35_clean :
+	del bcb\boost_regex-bcb-mt-1_35\*.obj
+	del bcb\boost_regex-bcb-mt-1_35\*.il?
+	del bcb\boost_regex-bcb-mt-1_35\*.csm
+	del bcb\boost_regex-bcb-mt-1_35\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-1_34.lib : bcb\boost_regex-bcb-mt-1_34\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\cregex.obj bcb\boost_regex-bcb-mt-1_34\fileiter.obj bcb\boost_regex-bcb-mt-1_34\icu.obj bcb\boost_regex-bcb-mt-1_34\instances.obj bcb\boost_regex-bcb-mt-1_34\posix_api.obj bcb\boost_regex-bcb-mt-1_34\regex.obj bcb\boost_regex-bcb-mt-1_34\regex_debug.obj bcb\boost_regex-bcb-mt-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_34\static_mutex.obj bcb\boost_regex-bcb-mt-1_34\usinstances.obj bcb\boost_regex-bcb-mt-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_34\winstances.obj
+bcb\boost_regex-bcb-mt-1_35.lib : bcb\boost_regex-bcb-mt-1_35\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\cregex.obj bcb\boost_regex-bcb-mt-1_35\fileiter.obj bcb\boost_regex-bcb-mt-1_35\icu.obj bcb\boost_regex-bcb-mt-1_35\instances.obj bcb\boost_regex-bcb-mt-1_35\posix_api.obj bcb\boost_regex-bcb-mt-1_35\regex.obj bcb\boost_regex-bcb-mt-1_35\regex_debug.obj bcb\boost_regex-bcb-mt-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_35\static_mutex.obj bcb\boost_regex-bcb-mt-1_35\usinstances.obj bcb\boost_regex-bcb-mt-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_35\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_34.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_34\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\cregex.obj bcb\boost_regex-bcb-mt-1_34\fileiter.obj bcb\boost_regex-bcb-mt-1_34\icu.obj bcb\boost_regex-bcb-mt-1_34\instances.obj bcb\boost_regex-bcb-mt-1_34\posix_api.obj bcb\boost_regex-bcb-mt-1_34\regex.obj bcb\boost_regex-bcb-mt-1_34\regex_debug.obj bcb\boost_regex-bcb-mt-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_34\static_mutex.obj bcb\boost_regex-bcb-mt-1_34\usinstances.obj bcb\boost_regex-bcb-mt-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_34\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_34\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_35.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_35\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\cregex.obj bcb\boost_regex-bcb-mt-1_35\fileiter.obj bcb\boost_regex-bcb-mt-1_35\icu.obj bcb\boost_regex-bcb-mt-1_35\instances.obj bcb\boost_regex-bcb-mt-1_35\posix_api.obj bcb\boost_regex-bcb-mt-1_35\regex.obj bcb\boost_regex-bcb-mt-1_35\regex_debug.obj bcb\boost_regex-bcb-mt-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_35\static_mutex.obj bcb\boost_regex-bcb-mt-1_35\usinstances.obj bcb\boost_regex-bcb-mt-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_35\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_35\winstances.obj $(LIBS)
 |
-	implib -w bcb\boost_regex-bcb-mt-1_34.lib bcb\boost_regex-bcb-mt-1_34.dll
+	implib -w bcb\boost_regex-bcb-mt-1_35.lib bcb\boost_regex-bcb-mt-1_35.dll
 
 ########################################################
 #
-# section for boost_regex-bcb-1_34.lib
+# section for boost_regex-bcb-1_35.lib
 #
 ########################################################
-bcb\boost_regex-bcb-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\boost_regex-bcb-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\boost_regex-bcb-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\boost_regex-bcb-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\boost_regex-bcb-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\boost_regex-bcb-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\boost_regex-bcb-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\boost_regex-bcb-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\boost_regex-bcb-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\boost_regex-bcb-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\boost_regex-bcb-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\boost_regex-bcb-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\boost_regex-bcb-1_34 :
-	-@mkdir bcb\boost_regex-bcb-1_34
+bcb\boost_regex-bcb-1_35 :
+	-@mkdir bcb\boost_regex-bcb-1_35
 
-boost_regex-bcb-1_34_clean :
-	del bcb\boost_regex-bcb-1_34\*.obj
-	del bcb\boost_regex-bcb-1_34\*.il?
-	del bcb\boost_regex-bcb-1_34\*.csm
-	del bcb\boost_regex-bcb-1_34\*.tds
+boost_regex-bcb-1_35_clean :
+	del bcb\boost_regex-bcb-1_35\*.obj
+	del bcb\boost_regex-bcb-1_35\*.il?
+	del bcb\boost_regex-bcb-1_35\*.csm
+	del bcb\boost_regex-bcb-1_35\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-1_34.lib : bcb\boost_regex-bcb-1_34\c_regex_traits.obj bcb\boost_regex-bcb-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-1_34\cregex.obj bcb\boost_regex-bcb-1_34\fileiter.obj bcb\boost_regex-bcb-1_34\icu.obj bcb\boost_regex-bcb-1_34\instances.obj bcb\boost_regex-bcb-1_34\posix_api.obj bcb\boost_regex-bcb-1_34\regex.obj bcb\boost_regex-bcb-1_34\regex_debug.obj bcb\boost_regex-bcb-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-1_34\static_mutex.obj bcb\boost_regex-bcb-1_34\usinstances.obj bcb\boost_regex-bcb-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-1_34\wide_posix_api.obj bcb\boost_regex-bcb-1_34\winstances.obj
+bcb\boost_regex-bcb-1_35.lib : bcb\boost_regex-bcb-1_35\c_regex_traits.obj bcb\boost_regex-bcb-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-1_35\cregex.obj bcb\boost_regex-bcb-1_35\fileiter.obj bcb\boost_regex-bcb-1_35\icu.obj bcb\boost_regex-bcb-1_35\instances.obj bcb\boost_regex-bcb-1_35\posix_api.obj bcb\boost_regex-bcb-1_35\regex.obj bcb\boost_regex-bcb-1_35\regex_debug.obj bcb\boost_regex-bcb-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-1_35\static_mutex.obj bcb\boost_regex-bcb-1_35\usinstances.obj bcb\boost_regex-bcb-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-1_35\wide_posix_api.obj bcb\boost_regex-bcb-1_35\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_34.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_34\c_regex_traits.obj bcb\boost_regex-bcb-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-1_34\cregex.obj bcb\boost_regex-bcb-1_34\fileiter.obj bcb\boost_regex-bcb-1_34\icu.obj bcb\boost_regex-bcb-1_34\instances.obj bcb\boost_regex-bcb-1_34\posix_api.obj bcb\boost_regex-bcb-1_34\regex.obj bcb\boost_regex-bcb-1_34\regex_debug.obj bcb\boost_regex-bcb-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-1_34\static_mutex.obj bcb\boost_regex-bcb-1_34\usinstances.obj bcb\boost_regex-bcb-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-1_34\wide_posix_api.obj bcb\boost_regex-bcb-1_34\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_35.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_35\c_regex_traits.obj bcb\boost_regex-bcb-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-1_35\cregex.obj bcb\boost_regex-bcb-1_35\fileiter.obj bcb\boost_regex-bcb-1_35\icu.obj bcb\boost_regex-bcb-1_35\instances.obj bcb\boost_regex-bcb-1_35\posix_api.obj bcb\boost_regex-bcb-1_35\regex.obj bcb\boost_regex-bcb-1_35\regex_debug.obj bcb\boost_regex-bcb-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-1_35\static_mutex.obj bcb\boost_regex-bcb-1_35\usinstances.obj bcb\boost_regex-bcb-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-1_35\wide_posix_api.obj bcb\boost_regex-bcb-1_35\winstances.obj $(LIBS)
 |
-	implib -w bcb\boost_regex-bcb-1_34.lib bcb\boost_regex-bcb-1_34.dll
+	implib -w bcb\boost_regex-bcb-1_35.lib bcb\boost_regex-bcb-1_35.dll
 
 ########################################################
 #
-# section for libboost_regex-bcb-mt-1_34.lib
+# section for libboost_regex-bcb-mt-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-mt-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-mt-1_34
+bcb\libboost_regex-bcb-mt-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-mt-1_35
 
-libboost_regex-bcb-mt-1_34_clean :
-	del bcb\libboost_regex-bcb-mt-1_34\*.obj
-	del bcb\libboost_regex-bcb-mt-1_34\*.il?
-	del bcb\libboost_regex-bcb-mt-1_34\*.csm
-	del bcb\libboost_regex-bcb-mt-1_34\*.tds
+libboost_regex-bcb-mt-1_35_clean :
+	del bcb\libboost_regex-bcb-mt-1_35\*.obj
+	del bcb\libboost_regex-bcb-mt-1_35\*.il?
+	del bcb\libboost_regex-bcb-mt-1_35\*.csm
+	del bcb\libboost_regex-bcb-mt-1_35\*.tds
 
-bcb\libboost_regex-bcb-mt-1_34.lib : bcb\libboost_regex-bcb-mt-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_34\cregex.obj bcb\libboost_regex-bcb-mt-1_34\fileiter.obj bcb\libboost_regex-bcb-mt-1_34\icu.obj bcb\libboost_regex-bcb-mt-1_34\instances.obj bcb\libboost_regex-bcb-mt-1_34\posix_api.obj bcb\libboost_regex-bcb-mt-1_34\regex.obj bcb\libboost_regex-bcb-mt-1_34\regex_debug.obj bcb\libboost_regex-bcb-mt-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-1_34\static_mutex.obj bcb\libboost_regex-bcb-mt-1_34\usinstances.obj bcb\libboost_regex-bcb-mt-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-mt-1_34.lib del bcb\libboost_regex-bcb-mt-1_34.lib 
+bcb\libboost_regex-bcb-mt-1_35.lib : bcb\libboost_regex-bcb-mt-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_35\cregex.obj bcb\libboost_regex-bcb-mt-1_35\fileiter.obj bcb\libboost_regex-bcb-mt-1_35\icu.obj bcb\libboost_regex-bcb-mt-1_35\instances.obj bcb\libboost_regex-bcb-mt-1_35\posix_api.obj bcb\libboost_regex-bcb-mt-1_35\regex.obj bcb\libboost_regex-bcb-mt-1_35\regex_debug.obj bcb\libboost_regex-bcb-mt-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-1_35\static_mutex.obj bcb\libboost_regex-bcb-mt-1_35\usinstances.obj bcb\libboost_regex-bcb-mt-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-mt-1_35.lib del bcb\libboost_regex-bcb-mt-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_34.lib"  +"bcb\libboost_regex-bcb-mt-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_34\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_34\icu.obj" +"bcb\libboost_regex-bcb-mt-1_34\instances.obj" +"bcb\libboost_regex-bcb-mt-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_34\regex.obj" +"bcb\libboost_regex-bcb-mt-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-mt-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_35.lib"  +"bcb\libboost_regex-bcb-mt-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_35\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_35\icu.obj" +"bcb\libboost_regex-bcb-mt-1_35\instances.obj" +"bcb\libboost_regex-bcb-mt-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_35\regex.obj" +"bcb\libboost_regex-bcb-mt-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-mt-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_35\winstances.obj"
 |
 
 ########################################################
 #
-# section for libboost_regex-bcb-1_34.lib
+# section for libboost_regex-bcb-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-1_34
+bcb\libboost_regex-bcb-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-1_35
 
-libboost_regex-bcb-1_34_clean :
-	del bcb\libboost_regex-bcb-1_34\*.obj
-	del bcb\libboost_regex-bcb-1_34\*.il?
-	del bcb\libboost_regex-bcb-1_34\*.csm
-	del bcb\libboost_regex-bcb-1_34\*.tds
+libboost_regex-bcb-1_35_clean :
+	del bcb\libboost_regex-bcb-1_35\*.obj
+	del bcb\libboost_regex-bcb-1_35\*.il?
+	del bcb\libboost_regex-bcb-1_35\*.csm
+	del bcb\libboost_regex-bcb-1_35\*.tds
 
-bcb\libboost_regex-bcb-1_34.lib : bcb\libboost_regex-bcb-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_34\cregex.obj bcb\libboost_regex-bcb-1_34\fileiter.obj bcb\libboost_regex-bcb-1_34\icu.obj bcb\libboost_regex-bcb-1_34\instances.obj bcb\libboost_regex-bcb-1_34\posix_api.obj bcb\libboost_regex-bcb-1_34\regex.obj bcb\libboost_regex-bcb-1_34\regex_debug.obj bcb\libboost_regex-bcb-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-1_34\static_mutex.obj bcb\libboost_regex-bcb-1_34\usinstances.obj bcb\libboost_regex-bcb-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-1_34.lib del bcb\libboost_regex-bcb-1_34.lib 
+bcb\libboost_regex-bcb-1_35.lib : bcb\libboost_regex-bcb-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_35\cregex.obj bcb\libboost_regex-bcb-1_35\fileiter.obj bcb\libboost_regex-bcb-1_35\icu.obj bcb\libboost_regex-bcb-1_35\instances.obj bcb\libboost_regex-bcb-1_35\posix_api.obj bcb\libboost_regex-bcb-1_35\regex.obj bcb\libboost_regex-bcb-1_35\regex_debug.obj bcb\libboost_regex-bcb-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-1_35\static_mutex.obj bcb\libboost_regex-bcb-1_35\usinstances.obj bcb\libboost_regex-bcb-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-1_35.lib del bcb\libboost_regex-bcb-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_34.lib"  +"bcb\libboost_regex-bcb-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_34\cregex.obj" +"bcb\libboost_regex-bcb-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-1_34\icu.obj" +"bcb\libboost_regex-bcb-1_34\instances.obj" +"bcb\libboost_regex-bcb-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-1_34\regex.obj" +"bcb\libboost_regex-bcb-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_35.lib"  +"bcb\libboost_regex-bcb-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_35\cregex.obj" +"bcb\libboost_regex-bcb-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-1_35\icu.obj" +"bcb\libboost_regex-bcb-1_35\instances.obj" +"bcb\libboost_regex-bcb-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-1_35\regex.obj" +"bcb\libboost_regex-bcb-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_35\winstances.obj"
 |
 
 ########################################################
 #
-# section for libboost_regex-bcb-sd-1_34.lib
+# section for libboost_regex-bcb-sd-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-sd-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-sd-1_34
+bcb\libboost_regex-bcb-sd-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-sd-1_35
 
-libboost_regex-bcb-sd-1_34_clean :
-	del bcb\libboost_regex-bcb-sd-1_34\*.obj
-	del bcb\libboost_regex-bcb-sd-1_34\*.il?
-	del bcb\libboost_regex-bcb-sd-1_34\*.csm
-	del bcb\libboost_regex-bcb-sd-1_34\*.tds
+libboost_regex-bcb-sd-1_35_clean :
+	del bcb\libboost_regex-bcb-sd-1_35\*.obj
+	del bcb\libboost_regex-bcb-sd-1_35\*.il?
+	del bcb\libboost_regex-bcb-sd-1_35\*.csm
+	del bcb\libboost_regex-bcb-sd-1_35\*.tds
 
-bcb\libboost_regex-bcb-sd-1_34.lib : bcb\libboost_regex-bcb-sd-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_34\cregex.obj bcb\libboost_regex-bcb-sd-1_34\fileiter.obj bcb\libboost_regex-bcb-sd-1_34\icu.obj bcb\libboost_regex-bcb-sd-1_34\instances.obj bcb\libboost_regex-bcb-sd-1_34\posix_api.obj bcb\libboost_regex-bcb-sd-1_34\regex.obj bcb\libboost_regex-bcb-sd-1_34\regex_debug.obj bcb\libboost_regex-bcb-sd-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-sd-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-sd-1_34\static_mutex.obj bcb\libboost_regex-bcb-sd-1_34\usinstances.obj bcb\libboost_regex-bcb-sd-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-sd-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-sd-1_34.lib del bcb\libboost_regex-bcb-sd-1_34.lib 
+bcb\libboost_regex-bcb-sd-1_35.lib : bcb\libboost_regex-bcb-sd-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_35\cregex.obj bcb\libboost_regex-bcb-sd-1_35\fileiter.obj bcb\libboost_regex-bcb-sd-1_35\icu.obj bcb\libboost_regex-bcb-sd-1_35\instances.obj bcb\libboost_regex-bcb-sd-1_35\posix_api.obj bcb\libboost_regex-bcb-sd-1_35\regex.obj bcb\libboost_regex-bcb-sd-1_35\regex_debug.obj bcb\libboost_regex-bcb-sd-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-sd-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-sd-1_35\static_mutex.obj bcb\libboost_regex-bcb-sd-1_35\usinstances.obj bcb\libboost_regex-bcb-sd-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-sd-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-sd-1_35.lib del bcb\libboost_regex-bcb-sd-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_34.lib"  +"bcb\libboost_regex-bcb-sd-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_34\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_34\icu.obj" +"bcb\libboost_regex-bcb-sd-1_34\instances.obj" +"bcb\libboost_regex-bcb-sd-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_34\regex.obj" +"bcb\libboost_regex-bcb-sd-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-sd-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-sd-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-sd-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-sd-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_35.lib"  +"bcb\libboost_regex-bcb-sd-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_35\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_35\icu.obj" +"bcb\libboost_regex-bcb-sd-1_35\instances.obj" +"bcb\libboost_regex-bcb-sd-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_35\regex.obj" +"bcb\libboost_regex-bcb-sd-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-sd-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-sd-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-sd-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-sd-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_35\winstances.obj"
 |
 
 ########################################################
 #
-# section for libboost_regex-bcb-mt-sd-1_34.lib
+# section for libboost_regex-bcb-mt-sd-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-mt-sd-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-mt-sd-1_34
+bcb\libboost_regex-bcb-mt-sd-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-mt-sd-1_35
 
-libboost_regex-bcb-mt-sd-1_34_clean :
-	del bcb\libboost_regex-bcb-mt-sd-1_34\*.obj
-	del bcb\libboost_regex-bcb-mt-sd-1_34\*.il?
-	del bcb\libboost_regex-bcb-mt-sd-1_34\*.csm
-	del bcb\libboost_regex-bcb-mt-sd-1_34\*.tds
+libboost_regex-bcb-mt-sd-1_35_clean :
+	del bcb\libboost_regex-bcb-mt-sd-1_35\*.obj
+	del bcb\libboost_regex-bcb-mt-sd-1_35\*.il?
+	del bcb\libboost_regex-bcb-mt-sd-1_35\*.csm
+	del bcb\libboost_regex-bcb-mt-sd-1_35\*.tds
 
-bcb\libboost_regex-bcb-mt-sd-1_34.lib : bcb\libboost_regex-bcb-mt-sd-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_34\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_34\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_34\icu.obj bcb\libboost_regex-bcb-mt-sd-1_34\instances.obj bcb\libboost_regex-bcb-mt-sd-1_34\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_34\regex.obj bcb\libboost_regex-bcb-mt-sd-1_34\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-sd-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-sd-1_34\static_mutex.obj bcb\libboost_regex-bcb-mt-sd-1_34\usinstances.obj bcb\libboost_regex-bcb-mt-sd-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-mt-sd-1_34.lib del bcb\libboost_regex-bcb-mt-sd-1_34.lib 
+bcb\libboost_regex-bcb-mt-sd-1_35.lib : bcb\libboost_regex-bcb-mt-sd-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_35\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_35\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_35\icu.obj bcb\libboost_regex-bcb-mt-sd-1_35\instances.obj bcb\libboost_regex-bcb-mt-sd-1_35\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_35\regex.obj bcb\libboost_regex-bcb-mt-sd-1_35\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-sd-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-sd-1_35\static_mutex.obj bcb\libboost_regex-bcb-mt-sd-1_35\usinstances.obj bcb\libboost_regex-bcb-mt-sd-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-mt-sd-1_35.lib del bcb\libboost_regex-bcb-mt-sd-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_34.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\icu.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_35.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\icu.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_35\winstances.obj"
 |
 
 ########################################################
 #
-# section for boost_regex-bcb-mt-d-1_34.lib
+# section for boost_regex-bcb-mt-d-1_35.lib
 #
 ########################################################
-bcb\boost_regex-bcb-mt-d-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_34 :
-	-@mkdir bcb\boost_regex-bcb-mt-d-1_34
+bcb\boost_regex-bcb-mt-d-1_35 :
+	-@mkdir bcb\boost_regex-bcb-mt-d-1_35
 
-boost_regex-bcb-mt-d-1_34_clean :
-	del bcb\boost_regex-bcb-mt-d-1_34\*.obj
-	del bcb\boost_regex-bcb-mt-d-1_34\*.il?
-	del bcb\boost_regex-bcb-mt-d-1_34\*.csm
-	del bcb\boost_regex-bcb-mt-d-1_34\*.tds
+boost_regex-bcb-mt-d-1_35_clean :
+	del bcb\boost_regex-bcb-mt-d-1_35\*.obj
+	del bcb\boost_regex-bcb-mt-d-1_35\*.il?
+	del bcb\boost_regex-bcb-mt-d-1_35\*.csm
+	del bcb\boost_regex-bcb-mt-d-1_35\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-d-1_34.lib : bcb\boost_regex-bcb-mt-d-1_34\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\cregex.obj bcb\boost_regex-bcb-mt-d-1_34\fileiter.obj bcb\boost_regex-bcb-mt-d-1_34\icu.obj bcb\boost_regex-bcb-mt-d-1_34\instances.obj bcb\boost_regex-bcb-mt-d-1_34\posix_api.obj bcb\boost_regex-bcb-mt-d-1_34\regex.obj bcb\boost_regex-bcb-mt-d-1_34\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_34\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_34\usinstances.obj bcb\boost_regex-bcb-mt-d-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_34\winstances.obj
+bcb\boost_regex-bcb-mt-d-1_35.lib : bcb\boost_regex-bcb-mt-d-1_35\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\cregex.obj bcb\boost_regex-bcb-mt-d-1_35\fileiter.obj bcb\boost_regex-bcb-mt-d-1_35\icu.obj bcb\boost_regex-bcb-mt-d-1_35\instances.obj bcb\boost_regex-bcb-mt-d-1_35\posix_api.obj bcb\boost_regex-bcb-mt-d-1_35\regex.obj bcb\boost_regex-bcb-mt-d-1_35\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_35\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_35\usinstances.obj bcb\boost_regex-bcb-mt-d-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_35\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_34.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_34\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\cregex.obj bcb\boost_regex-bcb-mt-d-1_34\fileiter.obj bcb\boost_regex-bcb-mt-d-1_34\icu.obj bcb\boost_regex-bcb-mt-d-1_34\instances.obj bcb\boost_regex-bcb-mt-d-1_34\posix_api.obj bcb\boost_regex-bcb-mt-d-1_34\regex.obj bcb\boost_regex-bcb-mt-d-1_34\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_34\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_34\usinstances.obj bcb\boost_regex-bcb-mt-d-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_34\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_34\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_35.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_35\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\cregex.obj bcb\boost_regex-bcb-mt-d-1_35\fileiter.obj bcb\boost_regex-bcb-mt-d-1_35\icu.obj bcb\boost_regex-bcb-mt-d-1_35\instances.obj bcb\boost_regex-bcb-mt-d-1_35\posix_api.obj bcb\boost_regex-bcb-mt-d-1_35\regex.obj bcb\boost_regex-bcb-mt-d-1_35\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_35\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_35\usinstances.obj bcb\boost_regex-bcb-mt-d-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_35\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_35\winstances.obj $(LIBS)
 |
-	implib -w bcb\boost_regex-bcb-mt-d-1_34.lib bcb\boost_regex-bcb-mt-d-1_34.dll
+	implib -w bcb\boost_regex-bcb-mt-d-1_35.lib bcb\boost_regex-bcb-mt-d-1_35.dll
 
 ########################################################
 #
-# section for boost_regex-bcb-d-1_34.lib
+# section for boost_regex-bcb-d-1_35.lib
 #
 ########################################################
-bcb\boost_regex-bcb-d-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\boost_regex-bcb-d-1_34 :
-	-@mkdir bcb\boost_regex-bcb-d-1_34
+bcb\boost_regex-bcb-d-1_35 :
+	-@mkdir bcb\boost_regex-bcb-d-1_35
 
-boost_regex-bcb-d-1_34_clean :
-	del bcb\boost_regex-bcb-d-1_34\*.obj
-	del bcb\boost_regex-bcb-d-1_34\*.il?
-	del bcb\boost_regex-bcb-d-1_34\*.csm
-	del bcb\boost_regex-bcb-d-1_34\*.tds
+boost_regex-bcb-d-1_35_clean :
+	del bcb\boost_regex-bcb-d-1_35\*.obj
+	del bcb\boost_regex-bcb-d-1_35\*.il?
+	del bcb\boost_regex-bcb-d-1_35\*.csm
+	del bcb\boost_regex-bcb-d-1_35\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-d-1_34.lib : bcb\boost_regex-bcb-d-1_34\c_regex_traits.obj bcb\boost_regex-bcb-d-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_34\cregex.obj bcb\boost_regex-bcb-d-1_34\fileiter.obj bcb\boost_regex-bcb-d-1_34\icu.obj bcb\boost_regex-bcb-d-1_34\instances.obj bcb\boost_regex-bcb-d-1_34\posix_api.obj bcb\boost_regex-bcb-d-1_34\regex.obj bcb\boost_regex-bcb-d-1_34\regex_debug.obj bcb\boost_regex-bcb-d-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_34\static_mutex.obj bcb\boost_regex-bcb-d-1_34\usinstances.obj bcb\boost_regex-bcb-d-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_34\wide_posix_api.obj bcb\boost_regex-bcb-d-1_34\winstances.obj
+bcb\boost_regex-bcb-d-1_35.lib : bcb\boost_regex-bcb-d-1_35\c_regex_traits.obj bcb\boost_regex-bcb-d-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_35\cregex.obj bcb\boost_regex-bcb-d-1_35\fileiter.obj bcb\boost_regex-bcb-d-1_35\icu.obj bcb\boost_regex-bcb-d-1_35\instances.obj bcb\boost_regex-bcb-d-1_35\posix_api.obj bcb\boost_regex-bcb-d-1_35\regex.obj bcb\boost_regex-bcb-d-1_35\regex_debug.obj bcb\boost_regex-bcb-d-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_35\static_mutex.obj bcb\boost_regex-bcb-d-1_35\usinstances.obj bcb\boost_regex-bcb-d-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_35\wide_posix_api.obj bcb\boost_regex-bcb-d-1_35\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_34.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_34\c_regex_traits.obj bcb\boost_regex-bcb-d-1_34\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_34\cregex.obj bcb\boost_regex-bcb-d-1_34\fileiter.obj bcb\boost_regex-bcb-d-1_34\icu.obj bcb\boost_regex-bcb-d-1_34\instances.obj bcb\boost_regex-bcb-d-1_34\posix_api.obj bcb\boost_regex-bcb-d-1_34\regex.obj bcb\boost_regex-bcb-d-1_34\regex_debug.obj bcb\boost_regex-bcb-d-1_34\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_34\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_34\static_mutex.obj bcb\boost_regex-bcb-d-1_34\usinstances.obj bcb\boost_regex-bcb-d-1_34\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_34\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_34\wide_posix_api.obj bcb\boost_regex-bcb-d-1_34\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_35.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_35\c_regex_traits.obj bcb\boost_regex-bcb-d-1_35\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_35\cregex.obj bcb\boost_regex-bcb-d-1_35\fileiter.obj bcb\boost_regex-bcb-d-1_35\icu.obj bcb\boost_regex-bcb-d-1_35\instances.obj bcb\boost_regex-bcb-d-1_35\posix_api.obj bcb\boost_regex-bcb-d-1_35\regex.obj bcb\boost_regex-bcb-d-1_35\regex_debug.obj bcb\boost_regex-bcb-d-1_35\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_35\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_35\static_mutex.obj bcb\boost_regex-bcb-d-1_35\usinstances.obj bcb\boost_regex-bcb-d-1_35\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_35\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_35\wide_posix_api.obj bcb\boost_regex-bcb-d-1_35\winstances.obj $(LIBS)
 |
-	implib -w bcb\boost_regex-bcb-d-1_34.lib bcb\boost_regex-bcb-d-1_34.dll
+	implib -w bcb\boost_regex-bcb-d-1_35.lib bcb\boost_regex-bcb-d-1_35.dll
 
 ########################################################
 #
-# section for libboost_regex-bcb-mt-d-1_34.lib
+# section for libboost_regex-bcb-mt-d-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-mt-d-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-mt-d-1_34
+bcb\libboost_regex-bcb-mt-d-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-mt-d-1_35
 
-libboost_regex-bcb-mt-d-1_34_clean :
-	del bcb\libboost_regex-bcb-mt-d-1_34\*.obj
-	del bcb\libboost_regex-bcb-mt-d-1_34\*.il?
-	del bcb\libboost_regex-bcb-mt-d-1_34\*.csm
-	del bcb\libboost_regex-bcb-mt-d-1_34\*.tds
+libboost_regex-bcb-mt-d-1_35_clean :
+	del bcb\libboost_regex-bcb-mt-d-1_35\*.obj
+	del bcb\libboost_regex-bcb-mt-d-1_35\*.il?
+	del bcb\libboost_regex-bcb-mt-d-1_35\*.csm
+	del bcb\libboost_regex-bcb-mt-d-1_35\*.tds
 
-bcb\libboost_regex-bcb-mt-d-1_34.lib : bcb\libboost_regex-bcb-mt-d-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_34\cregex.obj bcb\libboost_regex-bcb-mt-d-1_34\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_34\icu.obj bcb\libboost_regex-bcb-mt-d-1_34\instances.obj bcb\libboost_regex-bcb-mt-d-1_34\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_34\regex.obj bcb\libboost_regex-bcb-mt-d-1_34\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-d-1_34\static_mutex.obj bcb\libboost_regex-bcb-mt-d-1_34\usinstances.obj bcb\libboost_regex-bcb-mt-d-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-mt-d-1_34.lib del bcb\libboost_regex-bcb-mt-d-1_34.lib 
+bcb\libboost_regex-bcb-mt-d-1_35.lib : bcb\libboost_regex-bcb-mt-d-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_35\cregex.obj bcb\libboost_regex-bcb-mt-d-1_35\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_35\icu.obj bcb\libboost_regex-bcb-mt-d-1_35\instances.obj bcb\libboost_regex-bcb-mt-d-1_35\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_35\regex.obj bcb\libboost_regex-bcb-mt-d-1_35\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-d-1_35\static_mutex.obj bcb\libboost_regex-bcb-mt-d-1_35\usinstances.obj bcb\libboost_regex-bcb-mt-d-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-mt-d-1_35.lib del bcb\libboost_regex-bcb-mt-d-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_34.lib"  +"bcb\libboost_regex-bcb-mt-d-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\icu.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_35.lib"  +"bcb\libboost_regex-bcb-mt-d-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\icu.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_35\winstances.obj"
 |
 
 ########################################################
 #
-# section for libboost_regex-bcb-d-1_34.lib
+# section for libboost_regex-bcb-d-1_35.lib
 #
 ########################################################
-bcb\libboost_regex-bcb-d-1_34\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\cregex.obj ../src/cregex.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\fileiter.obj ../src/fileiter.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\icu.obj: ../src/icu.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\icu.obj: ../src/icu.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\icu.obj ../src/icu.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\icu.obj ../src/icu.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\instances.obj: ../src/instances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\instances.obj: ../src/instances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\instances.obj ../src/instances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\instances.obj ../src/instances.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\posix_api.obj ../src/posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\regex.obj: ../src/regex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\regex.obj ../src/regex.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\static_mutex.obj ../src/static_mutex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\static_mutex.obj ../src/static_mutex.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\usinstances.obj ../src/usinstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\usinstances.obj ../src/usinstances.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\wc_regex_traits.obj ../src/wc_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_35\winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_34\winstances.obj ../src/winstances.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_35\winstances.obj ../src/winstances.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_34 : 
-	-@mkdir bcb\libboost_regex-bcb-d-1_34
+bcb\libboost_regex-bcb-d-1_35 : 
+	-@mkdir bcb\libboost_regex-bcb-d-1_35
 
-libboost_regex-bcb-d-1_34_clean :
-	del bcb\libboost_regex-bcb-d-1_34\*.obj
-	del bcb\libboost_regex-bcb-d-1_34\*.il?
-	del bcb\libboost_regex-bcb-d-1_34\*.csm
-	del bcb\libboost_regex-bcb-d-1_34\*.tds
+libboost_regex-bcb-d-1_35_clean :
+	del bcb\libboost_regex-bcb-d-1_35\*.obj
+	del bcb\libboost_regex-bcb-d-1_35\*.il?
+	del bcb\libboost_regex-bcb-d-1_35\*.csm
+	del bcb\libboost_regex-bcb-d-1_35\*.tds
 
-bcb\libboost_regex-bcb-d-1_34.lib : bcb\libboost_regex-bcb-d-1_34\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_34\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_34\cregex.obj bcb\libboost_regex-bcb-d-1_34\fileiter.obj bcb\libboost_regex-bcb-d-1_34\icu.obj bcb\libboost_regex-bcb-d-1_34\instances.obj bcb\libboost_regex-bcb-d-1_34\posix_api.obj bcb\libboost_regex-bcb-d-1_34\regex.obj bcb\libboost_regex-bcb-d-1_34\regex_debug.obj bcb\libboost_regex-bcb-d-1_34\regex_raw_buffer.obj bcb\libboost_regex-bcb-d-1_34\regex_traits_defaults.obj bcb\libboost_regex-bcb-d-1_34\static_mutex.obj bcb\libboost_regex-bcb-d-1_34\usinstances.obj bcb\libboost_regex-bcb-d-1_34\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_34\wc_regex_traits.obj bcb\libboost_regex-bcb-d-1_34\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_34\winstances.obj
-	if exist bcb\libboost_regex-bcb-d-1_34.lib del bcb\libboost_regex-bcb-d-1_34.lib 
+bcb\libboost_regex-bcb-d-1_35.lib : bcb\libboost_regex-bcb-d-1_35\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_35\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_35\cregex.obj bcb\libboost_regex-bcb-d-1_35\fileiter.obj bcb\libboost_regex-bcb-d-1_35\icu.obj bcb\libboost_regex-bcb-d-1_35\instances.obj bcb\libboost_regex-bcb-d-1_35\posix_api.obj bcb\libboost_regex-bcb-d-1_35\regex.obj bcb\libboost_regex-bcb-d-1_35\regex_debug.obj bcb\libboost_regex-bcb-d-1_35\regex_raw_buffer.obj bcb\libboost_regex-bcb-d-1_35\regex_traits_defaults.obj bcb\libboost_regex-bcb-d-1_35\static_mutex.obj bcb\libboost_regex-bcb-d-1_35\usinstances.obj bcb\libboost_regex-bcb-d-1_35\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_35\wc_regex_traits.obj bcb\libboost_regex-bcb-d-1_35\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_35\winstances.obj
+	if exist bcb\libboost_regex-bcb-d-1_35.lib del bcb\libboost_regex-bcb-d-1_35.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_34.lib"  +"bcb\libboost_regex-bcb-d-1_34\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_34\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_34\cregex.obj" +"bcb\libboost_regex-bcb-d-1_34\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_34\icu.obj" +"bcb\libboost_regex-bcb-d-1_34\instances.obj" +"bcb\libboost_regex-bcb-d-1_34\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_34\regex.obj" +"bcb\libboost_regex-bcb-d-1_34\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_34\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-d-1_34\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-d-1_34\static_mutex.obj" +"bcb\libboost_regex-bcb-d-1_34\usinstances.obj" +"bcb\libboost_regex-bcb-d-1_34\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_34\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_34\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_34\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_35.lib"  +"bcb\libboost_regex-bcb-d-1_35\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_35\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_35\cregex.obj" +"bcb\libboost_regex-bcb-d-1_35\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_35\icu.obj" +"bcb\libboost_regex-bcb-d-1_35\instances.obj" +"bcb\libboost_regex-bcb-d-1_35\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_35\regex.obj" +"bcb\libboost_regex-bcb-d-1_35\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_35\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-d-1_35\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-d-1_35\static_mutex.obj" +"bcb\libboost_regex-bcb-d-1_35\usinstances.obj" +"bcb\libboost_regex-bcb-d-1_35\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_35\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_35\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_35\winstances.obj"
 |
 
diff --git a/build/common.sh b/build/common.sh
index 9812798c..b6053d04 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -6,7 +6,11 @@
 # locate all the header dependencies:
 for file in ../../../boost/regex/*.hpp ; do
 	if [ -f $file ]; then
-		header="$header $file"
+		if [ $file != ../../../boost/regex/concepts.hpp ]; then
+			if [ $file != ../../../boost/regex/mfc.hpp ]; then
+				header="$header $file"
+			fi
+		fi
 	fi
 done
 
@@ -58,3 +62,5 @@ boost_version=$(grep 'define.*BOOST_LIB_VERSION' ../../../boost/version.hpp | se
 echo Boost version tag = $boost_version
 
 
+
+
diff --git a/build/gcc-shared.mak b/build/gcc-shared.mak
index 4ef3e729..7aca2a0d 100644
--- a/build/gcc-shared.mak
+++ b/build/gcc-shared.mak
@@ -1,3 +1,7 @@
+# copyright John Maddock 2006-7
+# 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.
 #
 # auto generated makefile for gcc compiler
 #
@@ -41,14 +45,14 @@ $(warning "Building Boost.Regex with ICU in $(ICU_PATH)")
 endif
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : gcc  gcc gcc/boost_regex-gcc-1_34_shared ./gcc/libboost_regex-gcc-1_34.so gcc gcc/boost_regex-gcc-d-1_34_shared ./gcc/libboost_regex-gcc-d-1_34.so
+all : gcc  gcc gcc/boost_regex-gcc-1_35_shared ./gcc/libboost_regex-gcc-1_35.so gcc gcc/boost_regex-gcc-d-1_35_shared ./gcc/libboost_regex-gcc-d-1_35.so
 
 gcc :
 	mkdir -p gcc
 
-clean :  boost_regex-gcc-1_34_clean boost_regex-gcc-d-1_34_clean
+clean :  boost_regex-gcc-1_35_clean boost_regex-gcc-d-1_35_clean
 
 install : all
 
@@ -56,131 +60,132 @@ install : all
 
 ########################################################
 #
-# section for libboost_regex-gcc-1_34.a
+# section for libboost_regex-gcc-1_35.a
 #
 ########################################################
-gcc/boost_regex-gcc-1_34_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
+gcc/boost_regex-gcc-1_35_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
+gcc/boost_regex-gcc-1_35_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
+gcc/boost_regex-gcc-1_35_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
-gcc/boost_regex-gcc-1_34_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+gcc/boost_regex-gcc-1_35_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
 
-gcc/boost_regex-gcc-1_34_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
+gcc/boost_regex-gcc-1_35_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
-gcc/boost_regex-gcc-1_34_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
+gcc/boost_regex-gcc-1_35_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
-gcc/boost_regex-gcc-1_34_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
+gcc/boost_regex-gcc-1_35_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
-gcc/boost_regex-gcc-1_34_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
+gcc/boost_regex-gcc-1_35_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
-gcc/boost_regex-gcc-1_34_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
+gcc/boost_regex-gcc-1_35_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_34_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+gcc/boost_regex-gcc-1_35_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
 
-gcc/boost_regex-gcc-1_34_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+gcc/boost_regex-gcc-1_35_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
 
-gcc/boost_regex-gcc-1_34_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+gcc/boost_regex-gcc-1_35_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
 
-gcc/boost_regex-gcc-1_34_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
+gcc/boost_regex-gcc-1_35_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
-gcc/boost_regex-gcc-1_34_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+gcc/boost_regex-gcc-1_35_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
+gcc/boost_regex-gcc-1_35_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
+gcc/boost_regex-gcc-1_35_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
-gcc/boost_regex-gcc-1_34_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34_shared/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
+gcc/boost_regex-gcc-1_35_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35_shared/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
-gcc/boost_regex-gcc-1_34_shared : 
-	mkdir -p gcc/boost_regex-gcc-1_34_shared
+gcc/boost_regex-gcc-1_35_shared : 
+	mkdir -p gcc/boost_regex-gcc-1_35_shared
 
-boost_regex-gcc-1_34_clean :
-	rm -f gcc/boost_regex-gcc-1_34_shared/*.o
+boost_regex-gcc-1_35_clean :
+	rm -f gcc/boost_regex-gcc-1_35_shared/*.o
 
-./gcc/libboost_regex-gcc-1_34.so : gcc/boost_regex-gcc-1_34_shared/c_regex_traits.o gcc/boost_regex-gcc-1_34_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_34_shared/cregex.o gcc/boost_regex-gcc-1_34_shared/fileiter.o gcc/boost_regex-gcc-1_34_shared/icu.o gcc/boost_regex-gcc-1_34_shared/instances.o gcc/boost_regex-gcc-1_34_shared/posix_api.o gcc/boost_regex-gcc-1_34_shared/regex.o gcc/boost_regex-gcc-1_34_shared/regex_debug.o gcc/boost_regex-gcc-1_34_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_34_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_34_shared/static_mutex.o gcc/boost_regex-gcc-1_34_shared/usinstances.o gcc/boost_regex-gcc-1_34_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_34_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_34_shared/wide_posix_api.o gcc/boost_regex-gcc-1_34_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-1_34.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-1_34_shared/c_regex_traits.o gcc/boost_regex-gcc-1_34_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_34_shared/cregex.o gcc/boost_regex-gcc-1_34_shared/fileiter.o gcc/boost_regex-gcc-1_34_shared/icu.o gcc/boost_regex-gcc-1_34_shared/instances.o gcc/boost_regex-gcc-1_34_shared/posix_api.o gcc/boost_regex-gcc-1_34_shared/regex.o gcc/boost_regex-gcc-1_34_shared/regex_debug.o gcc/boost_regex-gcc-1_34_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_34_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_34_shared/static_mutex.o gcc/boost_regex-gcc-1_34_shared/usinstances.o gcc/boost_regex-gcc-1_34_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_34_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_34_shared/wide_posix_api.o gcc/boost_regex-gcc-1_34_shared/winstances.o $(ICU_LIBS) $(LIBS)
+./gcc/libboost_regex-gcc-1_35.so : gcc/boost_regex-gcc-1_35_shared/c_regex_traits.o gcc/boost_regex-gcc-1_35_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_35_shared/cregex.o gcc/boost_regex-gcc-1_35_shared/fileiter.o gcc/boost_regex-gcc-1_35_shared/icu.o gcc/boost_regex-gcc-1_35_shared/instances.o gcc/boost_regex-gcc-1_35_shared/posix_api.o gcc/boost_regex-gcc-1_35_shared/regex.o gcc/boost_regex-gcc-1_35_shared/regex_debug.o gcc/boost_regex-gcc-1_35_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_35_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_35_shared/static_mutex.o gcc/boost_regex-gcc-1_35_shared/usinstances.o gcc/boost_regex-gcc-1_35_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_35_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_35_shared/wide_posix_api.o gcc/boost_regex-gcc-1_35_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-1_35.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-1_35_shared/c_regex_traits.o gcc/boost_regex-gcc-1_35_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_35_shared/cregex.o gcc/boost_regex-gcc-1_35_shared/fileiter.o gcc/boost_regex-gcc-1_35_shared/icu.o gcc/boost_regex-gcc-1_35_shared/instances.o gcc/boost_regex-gcc-1_35_shared/posix_api.o gcc/boost_regex-gcc-1_35_shared/regex.o gcc/boost_regex-gcc-1_35_shared/regex_debug.o gcc/boost_regex-gcc-1_35_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_35_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_35_shared/static_mutex.o gcc/boost_regex-gcc-1_35_shared/usinstances.o gcc/boost_regex-gcc-1_35_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_35_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_35_shared/wide_posix_api.o gcc/boost_regex-gcc-1_35_shared/winstances.o $(ICU_LIBS) $(LIBS)
 
 ########################################################
 #
-# section for libboost_regex-gcc-d-1_34.a
+# section for libboost_regex-gcc-d-1_35.a
 #
 ########################################################
-gcc/boost_regex-gcc-d-1_34_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
+gcc/boost_regex-gcc-d-1_35_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+gcc/boost_regex-gcc-d-1_35_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
+gcc/boost_regex-gcc-d-1_35_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
+gcc/boost_regex-gcc-d-1_35_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
+gcc/boost_regex-gcc-d-1_35_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
+gcc/boost_regex-gcc-d-1_35_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
+gcc/boost_regex-gcc-d-1_35_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+gcc/boost_regex-gcc-d-1_35_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+gcc/boost_regex-gcc-d-1_35_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+gcc/boost_regex-gcc-d-1_35_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
+gcc/boost_regex-gcc-d-1_35_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
+gcc/boost_regex-gcc-d-1_35_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34_shared/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
+gcc/boost_regex-gcc-d-1_35_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35_shared/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
-gcc/boost_regex-gcc-d-1_34_shared : 
-	mkdir -p gcc/boost_regex-gcc-d-1_34_shared
+gcc/boost_regex-gcc-d-1_35_shared : 
+	mkdir -p gcc/boost_regex-gcc-d-1_35_shared
 
-boost_regex-gcc-d-1_34_clean :
-	rm -f gcc/boost_regex-gcc-d-1_34_shared/*.o
+boost_regex-gcc-d-1_35_clean :
+	rm -f gcc/boost_regex-gcc-d-1_35_shared/*.o
+
+./gcc/libboost_regex-gcc-d-1_35.so : gcc/boost_regex-gcc-d-1_35_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/cregex.o gcc/boost_regex-gcc-d-1_35_shared/fileiter.o gcc/boost_regex-gcc-d-1_35_shared/icu.o gcc/boost_regex-gcc-d-1_35_shared/instances.o gcc/boost_regex-gcc-d-1_35_shared/posix_api.o gcc/boost_regex-gcc-d-1_35_shared/regex.o gcc/boost_regex-gcc-d-1_35_shared/regex_debug.o gcc/boost_regex-gcc-d-1_35_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_35_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_35_shared/static_mutex.o gcc/boost_regex-gcc-d-1_35_shared/usinstances.o gcc/boost_regex-gcc-d-1_35_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_35_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-d-1_35.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-d-1_35_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/cregex.o gcc/boost_regex-gcc-d-1_35_shared/fileiter.o gcc/boost_regex-gcc-d-1_35_shared/icu.o gcc/boost_regex-gcc-d-1_35_shared/instances.o gcc/boost_regex-gcc-d-1_35_shared/posix_api.o gcc/boost_regex-gcc-d-1_35_shared/regex.o gcc/boost_regex-gcc-d-1_35_shared/regex_debug.o gcc/boost_regex-gcc-d-1_35_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_35_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_35_shared/static_mutex.o gcc/boost_regex-gcc-d-1_35_shared/usinstances.o gcc/boost_regex-gcc-d-1_35_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_35_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_35_shared/winstances.o $(ICU_LIBS) $(LIBS)
 
-./gcc/libboost_regex-gcc-d-1_34.so : gcc/boost_regex-gcc-d-1_34_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/cregex.o gcc/boost_regex-gcc-d-1_34_shared/fileiter.o gcc/boost_regex-gcc-d-1_34_shared/icu.o gcc/boost_regex-gcc-d-1_34_shared/instances.o gcc/boost_regex-gcc-d-1_34_shared/posix_api.o gcc/boost_regex-gcc-d-1_34_shared/regex.o gcc/boost_regex-gcc-d-1_34_shared/regex_debug.o gcc/boost_regex-gcc-d-1_34_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_34_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_34_shared/static_mutex.o gcc/boost_regex-gcc-d-1_34_shared/usinstances.o gcc/boost_regex-gcc-d-1_34_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_34_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-d-1_34.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-d-1_34_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/cregex.o gcc/boost_regex-gcc-d-1_34_shared/fileiter.o gcc/boost_regex-gcc-d-1_34_shared/icu.o gcc/boost_regex-gcc-d-1_34_shared/instances.o gcc/boost_regex-gcc-d-1_34_shared/posix_api.o gcc/boost_regex-gcc-d-1_34_shared/regex.o gcc/boost_regex-gcc-d-1_34_shared/regex_debug.o gcc/boost_regex-gcc-d-1_34_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_34_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_34_shared/static_mutex.o gcc/boost_regex-gcc-d-1_34_shared/usinstances.o gcc/boost_regex-gcc-d-1_34_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_34_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_34_shared/winstances.o $(ICU_LIBS) $(LIBS)
 
diff --git a/build/gcc.mak b/build/gcc.mak
index 2b223f84..715a02ca 100644
--- a/build/gcc.mak
+++ b/build/gcc.mak
@@ -1,4 +1,4 @@
-# copyright John Maddock 2006
+# copyright John Maddock 2006-7
 # 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.
@@ -45,14 +45,14 @@ $(warning "Building Boost.Regex with ICU in $(ICU_PATH)")
 endif
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : gcc  gcc gcc/boost_regex-gcc-1_34 ./gcc/libboost_regex-gcc-1_34.a gcc gcc/boost_regex-gcc-d-1_34 ./gcc/libboost_regex-gcc-d-1_34.a
+all : gcc  gcc gcc/boost_regex-gcc-1_35 ./gcc/libboost_regex-gcc-1_35.a gcc gcc/boost_regex-gcc-d-1_35 ./gcc/libboost_regex-gcc-d-1_35.a
 
 gcc :
 	mkdir -p gcc
 
-clean :  boost_regex-gcc-1_34_clean boost_regex-gcc-d-1_34_clean
+clean :  boost_regex-gcc-1_35_clean boost_regex-gcc-d-1_35_clean
 
 install : all
 
@@ -60,133 +60,134 @@ install : all
 
 ########################################################
 #
-# section for libboost_regex-gcc-1_34.a
+# section for libboost_regex-gcc-1_35.a
 #
 ########################################################
-gcc/boost_regex-gcc-1_34/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
+gcc/boost_regex-gcc-1_35/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
+gcc/boost_regex-gcc-1_35/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
+gcc/boost_regex-gcc-1_35/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
-gcc/boost_regex-gcc-1_34/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+gcc/boost_regex-gcc-1_35/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
 
-gcc/boost_regex-gcc-1_34/icu.o: ../src/icu.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
+gcc/boost_regex-gcc-1_35/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
-gcc/boost_regex-gcc-1_34/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
+gcc/boost_regex-gcc-1_35/instances.o: ../src/instances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
-gcc/boost_regex-gcc-1_34/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
+gcc/boost_regex-gcc-1_35/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
-gcc/boost_regex-gcc-1_34/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
+gcc/boost_regex-gcc-1_35/regex.o: ../src/regex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
-gcc/boost_regex-gcc-1_34/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
+gcc/boost_regex-gcc-1_35/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_34/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+gcc/boost_regex-gcc-1_35/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
 
-gcc/boost_regex-gcc-1_34/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+gcc/boost_regex-gcc-1_35/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
 
-gcc/boost_regex-gcc-1_34/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+gcc/boost_regex-gcc-1_35/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
 
-gcc/boost_regex-gcc-1_34/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
+gcc/boost_regex-gcc-1_35/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
-gcc/boost_regex-gcc-1_34/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+gcc/boost_regex-gcc-1_35/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
+gcc/boost_regex-gcc-1_35/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_34/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
+gcc/boost_regex-gcc-1_35/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
-gcc/boost_regex-gcc-1_34/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_34/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
+gcc/boost_regex-gcc-1_35/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_35/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
-gcc/boost_regex-gcc-1_34 : 
-	mkdir -p gcc/boost_regex-gcc-1_34
+gcc/boost_regex-gcc-1_35 : 
+	mkdir -p gcc/boost_regex-gcc-1_35
 
-boost_regex-gcc-1_34_clean :
-	rm -f gcc/boost_regex-gcc-1_34/*.o
+boost_regex-gcc-1_35_clean :
+	rm -f gcc/boost_regex-gcc-1_35/*.o
 
-./gcc/libboost_regex-gcc-1_34.a : gcc/boost_regex-gcc-1_34/c_regex_traits.o gcc/boost_regex-gcc-1_34/cpp_regex_traits.o gcc/boost_regex-gcc-1_34/cregex.o gcc/boost_regex-gcc-1_34/fileiter.o gcc/boost_regex-gcc-1_34/icu.o gcc/boost_regex-gcc-1_34/instances.o gcc/boost_regex-gcc-1_34/posix_api.o gcc/boost_regex-gcc-1_34/regex.o gcc/boost_regex-gcc-1_34/regex_debug.o gcc/boost_regex-gcc-1_34/regex_raw_buffer.o gcc/boost_regex-gcc-1_34/regex_traits_defaults.o gcc/boost_regex-gcc-1_34/static_mutex.o gcc/boost_regex-gcc-1_34/usinstances.o gcc/boost_regex-gcc-1_34/w32_regex_traits.o gcc/boost_regex-gcc-1_34/wc_regex_traits.o gcc/boost_regex-gcc-1_34/wide_posix_api.o gcc/boost_regex-gcc-1_34/winstances.o
-	ar -r gcc/libboost_regex-gcc-1_34.a  gcc/boost_regex-gcc-1_34/c_regex_traits.o gcc/boost_regex-gcc-1_34/cpp_regex_traits.o gcc/boost_regex-gcc-1_34/cregex.o gcc/boost_regex-gcc-1_34/fileiter.o gcc/boost_regex-gcc-1_34/icu.o gcc/boost_regex-gcc-1_34/instances.o gcc/boost_regex-gcc-1_34/posix_api.o gcc/boost_regex-gcc-1_34/regex.o gcc/boost_regex-gcc-1_34/regex_debug.o gcc/boost_regex-gcc-1_34/regex_raw_buffer.o gcc/boost_regex-gcc-1_34/regex_traits_defaults.o gcc/boost_regex-gcc-1_34/static_mutex.o gcc/boost_regex-gcc-1_34/usinstances.o gcc/boost_regex-gcc-1_34/w32_regex_traits.o gcc/boost_regex-gcc-1_34/wc_regex_traits.o gcc/boost_regex-gcc-1_34/wide_posix_api.o gcc/boost_regex-gcc-1_34/winstances.o
-	-ar -s gcc/libboost_regex-gcc-1_34.a
+./gcc/libboost_regex-gcc-1_35.a : gcc/boost_regex-gcc-1_35/c_regex_traits.o gcc/boost_regex-gcc-1_35/cpp_regex_traits.o gcc/boost_regex-gcc-1_35/cregex.o gcc/boost_regex-gcc-1_35/fileiter.o gcc/boost_regex-gcc-1_35/icu.o gcc/boost_regex-gcc-1_35/instances.o gcc/boost_regex-gcc-1_35/posix_api.o gcc/boost_regex-gcc-1_35/regex.o gcc/boost_regex-gcc-1_35/regex_debug.o gcc/boost_regex-gcc-1_35/regex_raw_buffer.o gcc/boost_regex-gcc-1_35/regex_traits_defaults.o gcc/boost_regex-gcc-1_35/static_mutex.o gcc/boost_regex-gcc-1_35/usinstances.o gcc/boost_regex-gcc-1_35/w32_regex_traits.o gcc/boost_regex-gcc-1_35/wc_regex_traits.o gcc/boost_regex-gcc-1_35/wide_posix_api.o gcc/boost_regex-gcc-1_35/winstances.o
+	ar -r gcc/libboost_regex-gcc-1_35.a  gcc/boost_regex-gcc-1_35/c_regex_traits.o gcc/boost_regex-gcc-1_35/cpp_regex_traits.o gcc/boost_regex-gcc-1_35/cregex.o gcc/boost_regex-gcc-1_35/fileiter.o gcc/boost_regex-gcc-1_35/icu.o gcc/boost_regex-gcc-1_35/instances.o gcc/boost_regex-gcc-1_35/posix_api.o gcc/boost_regex-gcc-1_35/regex.o gcc/boost_regex-gcc-1_35/regex_debug.o gcc/boost_regex-gcc-1_35/regex_raw_buffer.o gcc/boost_regex-gcc-1_35/regex_traits_defaults.o gcc/boost_regex-gcc-1_35/static_mutex.o gcc/boost_regex-gcc-1_35/usinstances.o gcc/boost_regex-gcc-1_35/w32_regex_traits.o gcc/boost_regex-gcc-1_35/wc_regex_traits.o gcc/boost_regex-gcc-1_35/wide_posix_api.o gcc/boost_regex-gcc-1_35/winstances.o
+	-ar -s gcc/libboost_regex-gcc-1_35.a
 
 ########################################################
 #
-# section for libboost_regex-gcc-d-1_34.a
+# section for libboost_regex-gcc-d-1_35.a
 #
 ########################################################
-gcc/boost_regex-gcc-d-1_34/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
+gcc/boost_regex-gcc-d-1_35/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
-gcc/boost_regex-gcc-d-1_34/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+gcc/boost_regex-gcc-d-1_35/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
 
-gcc/boost_regex-gcc-d-1_34/icu.o: ../src/icu.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
+gcc/boost_regex-gcc-d-1_35/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
-gcc/boost_regex-gcc-d-1_34/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
+gcc/boost_regex-gcc-d-1_35/instances.o: ../src/instances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
-gcc/boost_regex-gcc-d-1_34/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
+gcc/boost_regex-gcc-d-1_35/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
-gcc/boost_regex-gcc-d-1_34/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
+gcc/boost_regex-gcc-d-1_35/regex.o: ../src/regex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
-gcc/boost_regex-gcc-d-1_34/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
+gcc/boost_regex-gcc-d-1_35/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_34/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+gcc/boost_regex-gcc-d-1_35/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
 
-gcc/boost_regex-gcc-d-1_34/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+gcc/boost_regex-gcc-d-1_35/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
 
-gcc/boost_regex-gcc-d-1_34/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+gcc/boost_regex-gcc-d-1_35/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
 
-gcc/boost_regex-gcc-d-1_34/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
+gcc/boost_regex-gcc-d-1_35/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
-gcc/boost_regex-gcc-d-1_34/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
+gcc/boost_regex-gcc-d-1_35/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_34/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
+gcc/boost_regex-gcc-d-1_35/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
-gcc/boost_regex-gcc-d-1_34/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_34/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
+gcc/boost_regex-gcc-d-1_35/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_35/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
-gcc/boost_regex-gcc-d-1_34 : 
-	mkdir -p gcc/boost_regex-gcc-d-1_34
+gcc/boost_regex-gcc-d-1_35 : 
+	mkdir -p gcc/boost_regex-gcc-d-1_35
 
-boost_regex-gcc-d-1_34_clean :
-	rm -f gcc/boost_regex-gcc-d-1_34/*.o
+boost_regex-gcc-d-1_35_clean :
+	rm -f gcc/boost_regex-gcc-d-1_35/*.o
+
+./gcc/libboost_regex-gcc-d-1_35.a : gcc/boost_regex-gcc-d-1_35/c_regex_traits.o gcc/boost_regex-gcc-d-1_35/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_35/cregex.o gcc/boost_regex-gcc-d-1_35/fileiter.o gcc/boost_regex-gcc-d-1_35/icu.o gcc/boost_regex-gcc-d-1_35/instances.o gcc/boost_regex-gcc-d-1_35/posix_api.o gcc/boost_regex-gcc-d-1_35/regex.o gcc/boost_regex-gcc-d-1_35/regex_debug.o gcc/boost_regex-gcc-d-1_35/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_35/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_35/static_mutex.o gcc/boost_regex-gcc-d-1_35/usinstances.o gcc/boost_regex-gcc-d-1_35/w32_regex_traits.o gcc/boost_regex-gcc-d-1_35/wc_regex_traits.o gcc/boost_regex-gcc-d-1_35/wide_posix_api.o gcc/boost_regex-gcc-d-1_35/winstances.o
+	ar -r gcc/libboost_regex-gcc-d-1_35.a  gcc/boost_regex-gcc-d-1_35/c_regex_traits.o gcc/boost_regex-gcc-d-1_35/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_35/cregex.o gcc/boost_regex-gcc-d-1_35/fileiter.o gcc/boost_regex-gcc-d-1_35/icu.o gcc/boost_regex-gcc-d-1_35/instances.o gcc/boost_regex-gcc-d-1_35/posix_api.o gcc/boost_regex-gcc-d-1_35/regex.o gcc/boost_regex-gcc-d-1_35/regex_debug.o gcc/boost_regex-gcc-d-1_35/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_35/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_35/static_mutex.o gcc/boost_regex-gcc-d-1_35/usinstances.o gcc/boost_regex-gcc-d-1_35/w32_regex_traits.o gcc/boost_regex-gcc-d-1_35/wc_regex_traits.o gcc/boost_regex-gcc-d-1_35/wide_posix_api.o gcc/boost_regex-gcc-d-1_35/winstances.o
+	-ar -s gcc/libboost_regex-gcc-d-1_35.a
 
-./gcc/libboost_regex-gcc-d-1_34.a : gcc/boost_regex-gcc-d-1_34/c_regex_traits.o gcc/boost_regex-gcc-d-1_34/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_34/cregex.o gcc/boost_regex-gcc-d-1_34/fileiter.o gcc/boost_regex-gcc-d-1_34/icu.o gcc/boost_regex-gcc-d-1_34/instances.o gcc/boost_regex-gcc-d-1_34/posix_api.o gcc/boost_regex-gcc-d-1_34/regex.o gcc/boost_regex-gcc-d-1_34/regex_debug.o gcc/boost_regex-gcc-d-1_34/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_34/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_34/static_mutex.o gcc/boost_regex-gcc-d-1_34/usinstances.o gcc/boost_regex-gcc-d-1_34/w32_regex_traits.o gcc/boost_regex-gcc-d-1_34/wc_regex_traits.o gcc/boost_regex-gcc-d-1_34/wide_posix_api.o gcc/boost_regex-gcc-d-1_34/winstances.o
-	ar -r gcc/libboost_regex-gcc-d-1_34.a  gcc/boost_regex-gcc-d-1_34/c_regex_traits.o gcc/boost_regex-gcc-d-1_34/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_34/cregex.o gcc/boost_regex-gcc-d-1_34/fileiter.o gcc/boost_regex-gcc-d-1_34/icu.o gcc/boost_regex-gcc-d-1_34/instances.o gcc/boost_regex-gcc-d-1_34/posix_api.o gcc/boost_regex-gcc-d-1_34/regex.o gcc/boost_regex-gcc-d-1_34/regex_debug.o gcc/boost_regex-gcc-d-1_34/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_34/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_34/static_mutex.o gcc/boost_regex-gcc-d-1_34/usinstances.o gcc/boost_regex-gcc-d-1_34/w32_regex_traits.o gcc/boost_regex-gcc-d-1_34/wc_regex_traits.o gcc/boost_regex-gcc-d-1_34/wide_posix_api.o gcc/boost_regex-gcc-d-1_34/winstances.o
-	-ar -s gcc/libboost_regex-gcc-d-1_34.a
 
diff --git a/build/gcc_gen.sh b/build/gcc_gen.sh
index 9492e8ec..2c9ece45 100644
--- a/build/gcc_gen.sh
+++ b/build/gcc_gen.sh
@@ -108,7 +108,7 @@ function gcc_gen()
 	
 	
 	cat > $out << EOF
-# copyright John Maddock 2006
+# copyright John Maddock 2006-7
 # 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.
@@ -192,6 +192,10 @@ function gcc_gen_shared()
 	
 	
 	cat > $out << EOF
+# copyright John Maddock 2006-7
+# 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.
 #
 # auto generated makefile for gcc compiler
 #
@@ -271,3 +275,4 @@ rm -f $tout $iout
 
 
 
+
diff --git a/build/generic.mak b/build/generic.mak
index ebd8ae19..4ef093cc 100644
--- a/build/generic.mak
+++ b/build/generic.mak
@@ -30,7 +30,7 @@ C1=-c -O2 -I../../../
 
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
 all : $(DIRNAME)  $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.so
 
diff --git a/build/sunpro.mak b/build/sunpro.mak
index bb2e82f1..2fd0232d 100644
--- a/build/sunpro.mak
+++ b/build/sunpro.mak
@@ -38,7 +38,7 @@ SUNWS_CACHE_NAME=SunWS_cache
 
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
 all : sunpro sunpro/libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).a sunpro/libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).a sunpro/shared_libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).so sunpro/shared_libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).so
 
diff --git a/build/vc6-stlport.mak b/build/vc6-stlport.mak
index 42f5bf65..7c37ac58 100644
--- a/build/vc6-stlport.mak
+++ b/build/vc6-stlport.mak
@@ -60,24 +60,24 @@ ICU_LINK_OPTS= /LIBPATH:"$(ICU_PATH)\lib" icuin.lib icuuc.lib
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : main_dir libboost_regex-vc6-mt-sp-1_34_dir ./vc6-stlport/libboost_regex-vc6-mt-sp-1_34.lib boost_regex-vc6-mt-p-1_34_dir ./vc6-stlport/boost_regex-vc6-mt-p-1_34.lib libboost_regex-vc6-mt-p-1_34_dir ./vc6-stlport/libboost_regex-vc6-mt-p-1_34.lib boost_regex-vc6-mt-gdp-1_34_dir ./vc6-stlport/boost_regex-vc6-mt-gdp-1_34.lib libboost_regex-vc6-mt-sgdp-1_34_dir ./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.lib libboost_regex-vc6-mt-gdp-1_34_dir ./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34.lib
+all : main_dir libboost_regex-vc6-mt-sp-1_35_dir ./vc6-stlport/libboost_regex-vc6-mt-sp-1_35.lib boost_regex-vc6-mt-p-1_35_dir ./vc6-stlport/boost_regex-vc6-mt-p-1_35.lib libboost_regex-vc6-mt-p-1_35_dir ./vc6-stlport/libboost_regex-vc6-mt-p-1_35.lib boost_regex-vc6-mt-gdp-1_35_dir ./vc6-stlport/boost_regex-vc6-mt-gdp-1_35.lib libboost_regex-vc6-mt-sgdp-1_35_dir ./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.lib libboost_regex-vc6-mt-gdp-1_35_dir ./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35.lib
 
-clean :  libboost_regex-vc6-mt-sp-1_34_clean boost_regex-vc6-mt-p-1_34_clean libboost_regex-vc6-mt-p-1_34_clean boost_regex-vc6-mt-gdp-1_34_clean libboost_regex-vc6-mt-sgdp-1_34_clean libboost_regex-vc6-mt-gdp-1_34_clean
+clean :  libboost_regex-vc6-mt-sp-1_35_clean boost_regex-vc6-mt-p-1_35_clean libboost_regex-vc6-mt-p-1_35_clean boost_regex-vc6-mt-gdp-1_35_clean libboost_regex-vc6-mt-sgdp-1_35_clean libboost_regex-vc6-mt-gdp-1_35_clean
 
 install : stlport_check all
-	copy vc6-stlport\libboost_regex-vc6-mt-sp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6-stlport\boost_regex-vc6-mt-p-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6-stlport\boost_regex-vc6-mt-p-1_34.dll "$(MSVCDIR)\bin"
-	copy vc6-stlport\libboost_regex-vc6-mt-p-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6-stlport\boost_regex-vc6-mt-gdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6-stlport\boost_regex-vc6-mt-gdp-1_34.dll "$(MSVCDIR)\bin"
-	copy vc6-stlport\boost_regex-vc6-mt-gdp-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc6-stlport\libboost_regex-vc6-mt-gdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6-stlport\libboost_regex-vc6-mt-gdp-1_34.pdb "$(MSVCDIR)\lib"
+	copy vc6-stlport\libboost_regex-vc6-mt-sp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6-stlport\boost_regex-vc6-mt-p-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6-stlport\boost_regex-vc6-mt-p-1_35.dll "$(MSVCDIR)\bin"
+	copy vc6-stlport\libboost_regex-vc6-mt-p-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6-stlport\boost_regex-vc6-mt-gdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6-stlport\boost_regex-vc6-mt-gdp-1_35.dll "$(MSVCDIR)\bin"
+	copy vc6-stlport\boost_regex-vc6-mt-gdp-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc6-stlport\libboost_regex-vc6-mt-gdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6-stlport\libboost_regex-vc6-mt-gdp-1_35.pdb "$(MSVCDIR)\lib"
 
 main_dir :
 	@if not exist "vc6-stlport\$(NULL)" mkdir vc6-stlport
@@ -88,409 +88,409 @@ stlport_check : "$(STLPORT_PATH)\stlport\string"
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-sp-1_34.lib
+# section for libboost_regex-vc6-mt-sp-1_35.lib
 #
 ########################################################
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/c_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/cregex.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/cregex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/fileiter.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/fileiter.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/icu.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/icu.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/instances.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/instances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/regex.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/regex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/regex_debug.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/static_mutex.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/static_mutex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/usinstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/usinstances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/w32_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/wc_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/wide_posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_34.pdb ../src/winstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-sp-1_34_dir :
-	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sp-1_34\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sp-1_34
+libboost_regex-vc6-mt-sp-1_35_dir :
+	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sp-1_35\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sp-1_35
 
-libboost_regex-vc6-mt-sp-1_34_clean :
-	del vc6-stlport\libboost_regex-vc6-mt-sp-1_34\*.obj
-	del vc6-stlport\libboost_regex-vc6-mt-sp-1_34\*.idb
-	del vc6-stlport\libboost_regex-vc6-mt-sp-1_34\*.exp
-	del vc6-stlport\libboost_regex-vc6-mt-sp-1_34\*.pch
+libboost_regex-vc6-mt-sp-1_35_clean :
+	del vc6-stlport\libboost_regex-vc6-mt-sp-1_35\*.obj
+	del vc6-stlport\libboost_regex-vc6-mt-sp-1_35\*.idb
+	del vc6-stlport\libboost_regex-vc6-mt-sp-1_35\*.exp
+	del vc6-stlport\libboost_regex-vc6-mt-sp-1_35\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sp-1_34.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_34.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_34/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sp-1_35.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_35.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc6-mt-p-1_34.lib
+# section for boost_regex-vc6-mt-p-1_35.lib
 #
 ########################################################
-vc6-stlport/boost_regex-vc6-mt-p-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/c_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/cregex.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/cregex.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/fileiter.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/fileiter.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/icu.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/icu.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/instances.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/instances.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/posix_api.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/posix_api.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/regex.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/regex.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/regex_debug.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/static_mutex.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/static_mutex.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/usinstances.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/usinstances.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/w32_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/wc_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/wide_posix_api.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_34.pdb ../src/winstances.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc6-mt-p-1_34_dir :
-	@if not exist "vc6-stlport\boost_regex-vc6-mt-p-1_34\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-p-1_34
+boost_regex-vc6-mt-p-1_35_dir :
+	@if not exist "vc6-stlport\boost_regex-vc6-mt-p-1_35\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-p-1_35
 
-boost_regex-vc6-mt-p-1_34_clean :
-	del vc6-stlport\boost_regex-vc6-mt-p-1_34\*.obj
-	del vc6-stlport\boost_regex-vc6-mt-p-1_34\*.idb
-	del vc6-stlport\boost_regex-vc6-mt-p-1_34\*.exp
-	del vc6-stlport\boost_regex-vc6-mt-p-1_34\*.pch
+boost_regex-vc6-mt-p-1_35_clean :
+	del vc6-stlport\boost_regex-vc6-mt-p-1_35\*.obj
+	del vc6-stlport\boost_regex-vc6-mt-p-1_35\*.idb
+	del vc6-stlport\boost_regex-vc6-mt-p-1_35\*.exp
+	del vc6-stlport\boost_regex-vc6-mt-p-1_35\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-p-1_34.lib : vc6-stlport/boost_regex-vc6-mt-p-1_34/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_34.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_34.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-p-1_34/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_34/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-p-1_35.lib : vc6-stlport/boost_regex-vc6-mt-p-1_35/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_35.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_35.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-p-1_35/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-p-1_34.lib
+# section for libboost_regex-vc6-mt-p-1_35.lib
 #
 ########################################################
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/c_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/cregex.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/cregex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/fileiter.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/fileiter.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/icu.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/icu.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/instances.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/instances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/regex.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/regex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/regex_debug.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/static_mutex.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/static_mutex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/usinstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/usinstances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/w32_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/wc_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/wide_posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_34.pdb ../src/winstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-p-1_34_dir :
-	@if not exist "vc6-stlport\libboost_regex-vc6-mt-p-1_34\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-p-1_34
+libboost_regex-vc6-mt-p-1_35_dir :
+	@if not exist "vc6-stlport\libboost_regex-vc6-mt-p-1_35\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-p-1_35
 
-libboost_regex-vc6-mt-p-1_34_clean :
-	del vc6-stlport\libboost_regex-vc6-mt-p-1_34\*.obj
-	del vc6-stlport\libboost_regex-vc6-mt-p-1_34\*.idb
-	del vc6-stlport\libboost_regex-vc6-mt-p-1_34\*.exp
-	del vc6-stlport\libboost_regex-vc6-mt-p-1_34\*.pch
+libboost_regex-vc6-mt-p-1_35_clean :
+	del vc6-stlport\libboost_regex-vc6-mt-p-1_35\*.obj
+	del vc6-stlport\libboost_regex-vc6-mt-p-1_35\*.idb
+	del vc6-stlport\libboost_regex-vc6-mt-p-1_35\*.exp
+	del vc6-stlport\libboost_regex-vc6-mt-p-1_35\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-p-1_34.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_34.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_34/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-p-1_35.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_35.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc6-mt-gdp-1_34.lib
+# section for boost_regex-vc6-mt-gdp-1_35.lib
 #
 ########################################################
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/c_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/cregex.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/cregex.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/fileiter.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/fileiter.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/icu.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/icu.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/instances.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/instances.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/posix_api.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/posix_api.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/regex.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/regex.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/regex_debug.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/static_mutex.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/static_mutex.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/usinstances.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/usinstances.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/wide_posix_api.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb ../src/winstances.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc6-mt-gdp-1_34_dir :
-	@if not exist "vc6-stlport\boost_regex-vc6-mt-gdp-1_34\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-gdp-1_34
+boost_regex-vc6-mt-gdp-1_35_dir :
+	@if not exist "vc6-stlport\boost_regex-vc6-mt-gdp-1_35\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-gdp-1_35
 
-boost_regex-vc6-mt-gdp-1_34_clean :
-	del vc6-stlport\boost_regex-vc6-mt-gdp-1_34\*.obj
-	del vc6-stlport\boost_regex-vc6-mt-gdp-1_34\*.idb
-	del vc6-stlport\boost_regex-vc6-mt-gdp-1_34\*.exp
-	del vc6-stlport\boost_regex-vc6-mt-gdp-1_34\*.pch
+boost_regex-vc6-mt-gdp-1_35_clean :
+	del vc6-stlport\boost_regex-vc6-mt-gdp-1_35\*.obj
+	del vc6-stlport\boost_regex-vc6-mt-gdp-1_35\*.idb
+	del vc6-stlport\boost_regex-vc6-mt-gdp-1_35\*.exp
+	del vc6-stlport\boost_regex-vc6-mt-gdp-1_35\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-gdp-1_34.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_34/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_34.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_34.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_34/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_34/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-gdp-1_35.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_35/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_35.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_35.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_35/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-sgdp-1_34.lib
+# section for libboost_regex-vc6-mt-sgdp-1_35.lib
 #
 ########################################################
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/c_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/cregex.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/cregex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/fileiter.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/fileiter.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/icu.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/icu.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/instances.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/instances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/regex.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/regex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/regex_debug.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/static_mutex.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/static_mutex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/usinstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/usinstances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/wide_posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.pdb ../src/winstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-sgdp-1_34_dir :
-	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34
+libboost_regex-vc6-mt-sgdp-1_35_dir :
+	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35
 
-libboost_regex-vc6-mt-sgdp-1_34_clean :
-	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34\*.obj
-	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34\*.idb
-	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34\*.exp
-	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_34\*.pch
+libboost_regex-vc6-mt-sgdp-1_35_clean :
+	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35\*.obj
+	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35\*.idb
+	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35\*.exp
+	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_35\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_34/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-gdp-1_34.lib
+# section for libboost_regex-vc6-mt-gdp-1_35.lib
 #
 ########################################################
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/c_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/cregex.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/cregex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/fileiter.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/fileiter.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/icu.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/icu.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/instances.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/instances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/regex.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/regex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/regex_debug.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/static_mutex.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/static_mutex.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/usinstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/usinstances.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/wide_posix_api.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_34.pdb ../src/winstances.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-gdp-1_34_dir :
-	@if not exist "vc6-stlport\libboost_regex-vc6-mt-gdp-1_34\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-gdp-1_34
+libboost_regex-vc6-mt-gdp-1_35_dir :
+	@if not exist "vc6-stlport\libboost_regex-vc6-mt-gdp-1_35\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-gdp-1_35
 
-libboost_regex-vc6-mt-gdp-1_34_clean :
-	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_34\*.obj
-	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_34\*.idb
-	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_34\*.exp
-	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_34\*.pch
+libboost_regex-vc6-mt-gdp-1_35_clean :
+	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_35\*.obj
+	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_35\*.idb
+	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_35\*.exp
+	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_35\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-gdp-1_34.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_34.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_34/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-gdp-1_35.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_35.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_35/winstances.obj
 
diff --git a/build/vc6.mak b/build/vc6.mak
index 27a4952c..398f99e5 100644
--- a/build/vc6.mak
+++ b/build/vc6.mak
@@ -60,27 +60,27 @@ ICU_LINK_OPTS= /LIBPATH:"$(ICU_PATH)\lib" icuin.lib icuuc.lib
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : main_dir libboost_regex-vc6-s-1_34_dir ./vc6/libboost_regex-vc6-s-1_34.lib libboost_regex-vc6-mt-s-1_34_dir ./vc6/libboost_regex-vc6-mt-s-1_34.lib libboost_regex-vc6-sgd-1_34_dir ./vc6/libboost_regex-vc6-sgd-1_34.lib libboost_regex-vc6-mt-sgd-1_34_dir ./vc6/libboost_regex-vc6-mt-sgd-1_34.lib boost_regex-vc6-mt-gd-1_34_dir ./vc6/boost_regex-vc6-mt-gd-1_34.lib boost_regex-vc6-mt-1_34_dir ./vc6/boost_regex-vc6-mt-1_34.lib libboost_regex-vc6-mt-1_34_dir ./vc6/libboost_regex-vc6-mt-1_34.lib libboost_regex-vc6-mt-gd-1_34_dir ./vc6/libboost_regex-vc6-mt-gd-1_34.lib
+all : main_dir libboost_regex-vc6-s-1_35_dir ./vc6/libboost_regex-vc6-s-1_35.lib libboost_regex-vc6-mt-s-1_35_dir ./vc6/libboost_regex-vc6-mt-s-1_35.lib libboost_regex-vc6-sgd-1_35_dir ./vc6/libboost_regex-vc6-sgd-1_35.lib libboost_regex-vc6-mt-sgd-1_35_dir ./vc6/libboost_regex-vc6-mt-sgd-1_35.lib boost_regex-vc6-mt-gd-1_35_dir ./vc6/boost_regex-vc6-mt-gd-1_35.lib boost_regex-vc6-mt-1_35_dir ./vc6/boost_regex-vc6-mt-1_35.lib libboost_regex-vc6-mt-1_35_dir ./vc6/libboost_regex-vc6-mt-1_35.lib libboost_regex-vc6-mt-gd-1_35_dir ./vc6/libboost_regex-vc6-mt-gd-1_35.lib
 
-clean :  libboost_regex-vc6-s-1_34_clean libboost_regex-vc6-mt-s-1_34_clean libboost_regex-vc6-sgd-1_34_clean libboost_regex-vc6-mt-sgd-1_34_clean boost_regex-vc6-mt-gd-1_34_clean boost_regex-vc6-mt-1_34_clean libboost_regex-vc6-mt-1_34_clean libboost_regex-vc6-mt-gd-1_34_clean
+clean :  libboost_regex-vc6-s-1_35_clean libboost_regex-vc6-mt-s-1_35_clean libboost_regex-vc6-sgd-1_35_clean libboost_regex-vc6-mt-sgd-1_35_clean boost_regex-vc6-mt-gd-1_35_clean boost_regex-vc6-mt-1_35_clean libboost_regex-vc6-mt-1_35_clean libboost_regex-vc6-mt-gd-1_35_clean
 
 install : all
-	copy vc6\libboost_regex-vc6-s-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\libboost_regex-vc6-mt-s-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\libboost_regex-vc6-sgd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\libboost_regex-vc6-sgd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc6\libboost_regex-vc6-mt-sgd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\libboost_regex-vc6-mt-sgd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc6\boost_regex-vc6-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\boost_regex-vc6-mt-gd-1_34.dll "$(MSVCDIR)\bin"
-	copy vc6\boost_regex-vc6-mt-gd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc6\boost_regex-vc6-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\boost_regex-vc6-mt-1_34.dll "$(MSVCDIR)\bin"
-	copy vc6\libboost_regex-vc6-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\libboost_regex-vc6-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc6\libboost_regex-vc6-mt-gd-1_34.pdb "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-s-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-mt-s-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-sgd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-sgd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-mt-sgd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-mt-sgd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc6\boost_regex-vc6-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\boost_regex-vc6-mt-gd-1_35.dll "$(MSVCDIR)\bin"
+	copy vc6\boost_regex-vc6-mt-gd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc6\boost_regex-vc6-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\boost_regex-vc6-mt-1_35.dll "$(MSVCDIR)\bin"
+	copy vc6\libboost_regex-vc6-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc6\libboost_regex-vc6-mt-gd-1_35.pdb "$(MSVCDIR)\lib"
 
 main_dir :
 	@if not exist "vc6\$(NULL)" mkdir vc6
@@ -88,545 +88,545 @@ main_dir :
 
 ########################################################
 #
-# section for libboost_regex-vc6-s-1_34.lib
+# section for libboost_regex-vc6-s-1_35.lib
 #
 ########################################################
-vc6/libboost_regex-vc6-s-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/c_regex_traits.cpp
+vc6/libboost_regex-vc6-s-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-s-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/libboost_regex-vc6-s-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/libboost_regex-vc6-s-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/cregex.cpp
+vc6/libboost_regex-vc6-s-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/cregex.cpp
 
-vc6/libboost_regex-vc6-s-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/fileiter.cpp
+vc6/libboost_regex-vc6-s-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/fileiter.cpp
 
-vc6/libboost_regex-vc6-s-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/icu.cpp
+vc6/libboost_regex-vc6-s-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/icu.cpp
 
-vc6/libboost_regex-vc6-s-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/instances.cpp
+vc6/libboost_regex-vc6-s-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/instances.cpp
 
-vc6/libboost_regex-vc6-s-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/posix_api.cpp
+vc6/libboost_regex-vc6-s-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/posix_api.cpp
 
-vc6/libboost_regex-vc6-s-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/regex.cpp
+vc6/libboost_regex-vc6-s-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/regex.cpp
 
-vc6/libboost_regex-vc6-s-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/regex_debug.cpp
+vc6/libboost_regex-vc6-s-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-s-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/libboost_regex-vc6-s-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/libboost_regex-vc6-s-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/libboost_regex-vc6-s-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/libboost_regex-vc6-s-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/static_mutex.cpp
+vc6/libboost_regex-vc6-s-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/static_mutex.cpp
 
-vc6/libboost_regex-vc6-s-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/usinstances.cpp
+vc6/libboost_regex-vc6-s-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/usinstances.cpp
 
-vc6/libboost_regex-vc6-s-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/libboost_regex-vc6-s-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/libboost_regex-vc6-s-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/libboost_regex-vc6-s-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/libboost_regex-vc6-s-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/wide_posix_api.cpp
+vc6/libboost_regex-vc6-s-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/libboost_regex-vc6-s-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_34/ -Fdvc6/libboost_regex-vc6-s-1_34.pdb ../src/winstances.cpp
+vc6/libboost_regex-vc6-s-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_35/ -Fdvc6/libboost_regex-vc6-s-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-s-1_34_dir :
-	@if not exist "vc6\libboost_regex-vc6-s-1_34\$(NULL)" mkdir vc6\libboost_regex-vc6-s-1_34
+libboost_regex-vc6-s-1_35_dir :
+	@if not exist "vc6\libboost_regex-vc6-s-1_35\$(NULL)" mkdir vc6\libboost_regex-vc6-s-1_35
 
-libboost_regex-vc6-s-1_34_clean :
-	del vc6\libboost_regex-vc6-s-1_34\*.obj
-	del vc6\libboost_regex-vc6-s-1_34\*.idb
-	del vc6\libboost_regex-vc6-s-1_34\*.exp
-	del vc6\libboost_regex-vc6-s-1_34\*.pch
+libboost_regex-vc6-s-1_35_clean :
+	del vc6\libboost_regex-vc6-s-1_35\*.obj
+	del vc6\libboost_regex-vc6-s-1_35\*.idb
+	del vc6\libboost_regex-vc6-s-1_35\*.exp
+	del vc6\libboost_regex-vc6-s-1_35\*.pch
 
-./vc6/libboost_regex-vc6-s-1_34.lib : vc6/libboost_regex-vc6-s-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/cregex.obj vc6/libboost_regex-vc6-s-1_34/fileiter.obj vc6/libboost_regex-vc6-s-1_34/icu.obj vc6/libboost_regex-vc6-s-1_34/instances.obj vc6/libboost_regex-vc6-s-1_34/posix_api.obj vc6/libboost_regex-vc6-s-1_34/regex.obj vc6/libboost_regex-vc6-s-1_34/regex_debug.obj vc6/libboost_regex-vc6-s-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_34/static_mutex.obj vc6/libboost_regex-vc6-s-1_34/usinstances.obj vc6/libboost_regex-vc6-s-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_34/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_34.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/cregex.obj vc6/libboost_regex-vc6-s-1_34/fileiter.obj vc6/libboost_regex-vc6-s-1_34/icu.obj vc6/libboost_regex-vc6-s-1_34/instances.obj vc6/libboost_regex-vc6-s-1_34/posix_api.obj vc6/libboost_regex-vc6-s-1_34/regex.obj vc6/libboost_regex-vc6-s-1_34/regex_debug.obj vc6/libboost_regex-vc6-s-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_34/static_mutex.obj vc6/libboost_regex-vc6-s-1_34/usinstances.obj vc6/libboost_regex-vc6-s-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_34/winstances.obj
+./vc6/libboost_regex-vc6-s-1_35.lib : vc6/libboost_regex-vc6-s-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/cregex.obj vc6/libboost_regex-vc6-s-1_35/fileiter.obj vc6/libboost_regex-vc6-s-1_35/icu.obj vc6/libboost_regex-vc6-s-1_35/instances.obj vc6/libboost_regex-vc6-s-1_35/posix_api.obj vc6/libboost_regex-vc6-s-1_35/regex.obj vc6/libboost_regex-vc6-s-1_35/regex_debug.obj vc6/libboost_regex-vc6-s-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_35/static_mutex.obj vc6/libboost_regex-vc6-s-1_35/usinstances.obj vc6/libboost_regex-vc6-s-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_35/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_35.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/cregex.obj vc6/libboost_regex-vc6-s-1_35/fileiter.obj vc6/libboost_regex-vc6-s-1_35/icu.obj vc6/libboost_regex-vc6-s-1_35/instances.obj vc6/libboost_regex-vc6-s-1_35/posix_api.obj vc6/libboost_regex-vc6-s-1_35/regex.obj vc6/libboost_regex-vc6-s-1_35/regex_debug.obj vc6/libboost_regex-vc6-s-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_35/static_mutex.obj vc6/libboost_regex-vc6-s-1_35/usinstances.obj vc6/libboost_regex-vc6-s-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-s-1_34.lib
+# section for libboost_regex-vc6-mt-s-1_35.lib
 #
 ########################################################
-vc6/libboost_regex-vc6-mt-s-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/c_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/cregex.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/cregex.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/fileiter.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/fileiter.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/icu.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/icu.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/instances.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/instances.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/posix_api.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/regex.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/regex.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/regex_debug.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/static_mutex.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/static_mutex.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/usinstances.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/usinstances.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/wide_posix_api.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_34/ -Fdvc6/libboost_regex-vc6-mt-s-1_34.pdb ../src/winstances.cpp
+vc6/libboost_regex-vc6-mt-s-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_35/ -Fdvc6/libboost_regex-vc6-mt-s-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-s-1_34_dir :
-	@if not exist "vc6\libboost_regex-vc6-mt-s-1_34\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-s-1_34
+libboost_regex-vc6-mt-s-1_35_dir :
+	@if not exist "vc6\libboost_regex-vc6-mt-s-1_35\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-s-1_35
 
-libboost_regex-vc6-mt-s-1_34_clean :
-	del vc6\libboost_regex-vc6-mt-s-1_34\*.obj
-	del vc6\libboost_regex-vc6-mt-s-1_34\*.idb
-	del vc6\libboost_regex-vc6-mt-s-1_34\*.exp
-	del vc6\libboost_regex-vc6-mt-s-1_34\*.pch
+libboost_regex-vc6-mt-s-1_35_clean :
+	del vc6\libboost_regex-vc6-mt-s-1_35\*.obj
+	del vc6\libboost_regex-vc6-mt-s-1_35\*.idb
+	del vc6\libboost_regex-vc6-mt-s-1_35\*.exp
+	del vc6\libboost_regex-vc6-mt-s-1_35\*.pch
 
-./vc6/libboost_regex-vc6-mt-s-1_34.lib : vc6/libboost_regex-vc6-mt-s-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/cregex.obj vc6/libboost_regex-vc6-mt-s-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_34/icu.obj vc6/libboost_regex-vc6-mt-s-1_34/instances.obj vc6/libboost_regex-vc6-mt-s-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_34/regex.obj vc6/libboost_regex-vc6-mt-s-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_34/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_34.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/cregex.obj vc6/libboost_regex-vc6-mt-s-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_34/icu.obj vc6/libboost_regex-vc6-mt-s-1_34/instances.obj vc6/libboost_regex-vc6-mt-s-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_34/regex.obj vc6/libboost_regex-vc6-mt-s-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_34/winstances.obj
+./vc6/libboost_regex-vc6-mt-s-1_35.lib : vc6/libboost_regex-vc6-mt-s-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/cregex.obj vc6/libboost_regex-vc6-mt-s-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_35/icu.obj vc6/libboost_regex-vc6-mt-s-1_35/instances.obj vc6/libboost_regex-vc6-mt-s-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_35/regex.obj vc6/libboost_regex-vc6-mt-s-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_35/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_35.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/cregex.obj vc6/libboost_regex-vc6-mt-s-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_35/icu.obj vc6/libboost_regex-vc6-mt-s-1_35/instances.obj vc6/libboost_regex-vc6-mt-s-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_35/regex.obj vc6/libboost_regex-vc6-mt-s-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-sgd-1_34.lib
+# section for libboost_regex-vc6-sgd-1_35.lib
 #
 ########################################################
-vc6/libboost_regex-vc6-sgd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/c_regex_traits.cpp
+vc6/libboost_regex-vc6-sgd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/libboost_regex-vc6-sgd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/cregex.cpp
+vc6/libboost_regex-vc6-sgd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/cregex.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/fileiter.cpp
+vc6/libboost_regex-vc6-sgd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/fileiter.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/icu.cpp
+vc6/libboost_regex-vc6-sgd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/icu.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/instances.cpp
+vc6/libboost_regex-vc6-sgd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/instances.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/posix_api.cpp
+vc6/libboost_regex-vc6-sgd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/posix_api.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/regex.cpp
+vc6/libboost_regex-vc6-sgd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/regex.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/regex_debug.cpp
+vc6/libboost_regex-vc6-sgd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/libboost_regex-vc6-sgd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/libboost_regex-vc6-sgd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/static_mutex.cpp
+vc6/libboost_regex-vc6-sgd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/static_mutex.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/usinstances.cpp
+vc6/libboost_regex-vc6-sgd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/usinstances.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/libboost_regex-vc6-sgd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/libboost_regex-vc6-sgd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/wide_posix_api.cpp
+vc6/libboost_regex-vc6-sgd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/libboost_regex-vc6-sgd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_34/ -Fdvc6/libboost_regex-vc6-sgd-1_34.pdb ../src/winstances.cpp
+vc6/libboost_regex-vc6-sgd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_35/ -Fdvc6/libboost_regex-vc6-sgd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-sgd-1_34_dir :
-	@if not exist "vc6\libboost_regex-vc6-sgd-1_34\$(NULL)" mkdir vc6\libboost_regex-vc6-sgd-1_34
+libboost_regex-vc6-sgd-1_35_dir :
+	@if not exist "vc6\libboost_regex-vc6-sgd-1_35\$(NULL)" mkdir vc6\libboost_regex-vc6-sgd-1_35
 
-libboost_regex-vc6-sgd-1_34_clean :
-	del vc6\libboost_regex-vc6-sgd-1_34\*.obj
-	del vc6\libboost_regex-vc6-sgd-1_34\*.idb
-	del vc6\libboost_regex-vc6-sgd-1_34\*.exp
-	del vc6\libboost_regex-vc6-sgd-1_34\*.pch
+libboost_regex-vc6-sgd-1_35_clean :
+	del vc6\libboost_regex-vc6-sgd-1_35\*.obj
+	del vc6\libboost_regex-vc6-sgd-1_35\*.idb
+	del vc6\libboost_regex-vc6-sgd-1_35\*.exp
+	del vc6\libboost_regex-vc6-sgd-1_35\*.pch
 
-./vc6/libboost_regex-vc6-sgd-1_34.lib : vc6/libboost_regex-vc6-sgd-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/cregex.obj vc6/libboost_regex-vc6-sgd-1_34/fileiter.obj vc6/libboost_regex-vc6-sgd-1_34/icu.obj vc6/libboost_regex-vc6-sgd-1_34/instances.obj vc6/libboost_regex-vc6-sgd-1_34/posix_api.obj vc6/libboost_regex-vc6-sgd-1_34/regex.obj vc6/libboost_regex-vc6-sgd-1_34/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_34/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_34/usinstances.obj vc6/libboost_regex-vc6-sgd-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_34/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_34.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/cregex.obj vc6/libboost_regex-vc6-sgd-1_34/fileiter.obj vc6/libboost_regex-vc6-sgd-1_34/icu.obj vc6/libboost_regex-vc6-sgd-1_34/instances.obj vc6/libboost_regex-vc6-sgd-1_34/posix_api.obj vc6/libboost_regex-vc6-sgd-1_34/regex.obj vc6/libboost_regex-vc6-sgd-1_34/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_34/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_34/usinstances.obj vc6/libboost_regex-vc6-sgd-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_34/winstances.obj
+./vc6/libboost_regex-vc6-sgd-1_35.lib : vc6/libboost_regex-vc6-sgd-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/cregex.obj vc6/libboost_regex-vc6-sgd-1_35/fileiter.obj vc6/libboost_regex-vc6-sgd-1_35/icu.obj vc6/libboost_regex-vc6-sgd-1_35/instances.obj vc6/libboost_regex-vc6-sgd-1_35/posix_api.obj vc6/libboost_regex-vc6-sgd-1_35/regex.obj vc6/libboost_regex-vc6-sgd-1_35/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_35/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_35/usinstances.obj vc6/libboost_regex-vc6-sgd-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_35/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_35.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/cregex.obj vc6/libboost_regex-vc6-sgd-1_35/fileiter.obj vc6/libboost_regex-vc6-sgd-1_35/icu.obj vc6/libboost_regex-vc6-sgd-1_35/instances.obj vc6/libboost_regex-vc6-sgd-1_35/posix_api.obj vc6/libboost_regex-vc6-sgd-1_35/regex.obj vc6/libboost_regex-vc6-sgd-1_35/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_35/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_35/usinstances.obj vc6/libboost_regex-vc6-sgd-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-sgd-1_34.lib
+# section for libboost_regex-vc6-mt-sgd-1_35.lib
 #
 ########################################################
-vc6/libboost_regex-vc6-mt-sgd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/c_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/cregex.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/cregex.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/fileiter.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/fileiter.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/icu.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/icu.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/instances.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/instances.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/posix_api.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/regex.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/regex.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/regex_debug.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/static_mutex.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/static_mutex.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/usinstances.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/usinstances.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/wide_posix_api.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_34/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_34.pdb ../src/winstances.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_35/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-sgd-1_34_dir :
-	@if not exist "vc6\libboost_regex-vc6-mt-sgd-1_34\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-sgd-1_34
+libboost_regex-vc6-mt-sgd-1_35_dir :
+	@if not exist "vc6\libboost_regex-vc6-mt-sgd-1_35\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-sgd-1_35
 
-libboost_regex-vc6-mt-sgd-1_34_clean :
-	del vc6\libboost_regex-vc6-mt-sgd-1_34\*.obj
-	del vc6\libboost_regex-vc6-mt-sgd-1_34\*.idb
-	del vc6\libboost_regex-vc6-mt-sgd-1_34\*.exp
-	del vc6\libboost_regex-vc6-mt-sgd-1_34\*.pch
+libboost_regex-vc6-mt-sgd-1_35_clean :
+	del vc6\libboost_regex-vc6-mt-sgd-1_35\*.obj
+	del vc6\libboost_regex-vc6-mt-sgd-1_35\*.idb
+	del vc6\libboost_regex-vc6-mt-sgd-1_35\*.exp
+	del vc6\libboost_regex-vc6-mt-sgd-1_35\*.pch
 
-./vc6/libboost_regex-vc6-mt-sgd-1_34.lib : vc6/libboost_regex-vc6-mt-sgd-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_34/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_34/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_34/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_34.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_34/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_34/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_34/winstances.obj
+./vc6/libboost_regex-vc6-mt-sgd-1_35.lib : vc6/libboost_regex-vc6-mt-sgd-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_35/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_35/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_35/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_35.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_35/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_35/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc6-mt-gd-1_34.lib
+# section for boost_regex-vc6-mt-gd-1_35.lib
 #
 ########################################################
-vc6/boost_regex-vc6-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/cregex.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/icu.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/instances.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/regex.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_34/ -Fdvc6/boost_regex-vc6-mt-gd-1_34.pdb ../src/winstances.cpp
+vc6/boost_regex-vc6-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_35/ -Fdvc6/boost_regex-vc6-mt-gd-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc6-mt-gd-1_34_dir :
-	@if not exist "vc6\boost_regex-vc6-mt-gd-1_34\$(NULL)" mkdir vc6\boost_regex-vc6-mt-gd-1_34
+boost_regex-vc6-mt-gd-1_35_dir :
+	@if not exist "vc6\boost_regex-vc6-mt-gd-1_35\$(NULL)" mkdir vc6\boost_regex-vc6-mt-gd-1_35
 
-boost_regex-vc6-mt-gd-1_34_clean :
-	del vc6\boost_regex-vc6-mt-gd-1_34\*.obj
-	del vc6\boost_regex-vc6-mt-gd-1_34\*.idb
-	del vc6\boost_regex-vc6-mt-gd-1_34\*.exp
-	del vc6\boost_regex-vc6-mt-gd-1_34\*.pch
+boost_regex-vc6-mt-gd-1_35_clean :
+	del vc6\boost_regex-vc6-mt-gd-1_35\*.obj
+	del vc6\boost_regex-vc6-mt-gd-1_35\*.idb
+	del vc6\boost_regex-vc6-mt-gd-1_35\*.exp
+	del vc6\boost_regex-vc6-mt-gd-1_35\*.pch
 
-./vc6/boost_regex-vc6-mt-gd-1_34.lib : vc6/boost_regex-vc6-mt-gd-1_34/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/cregex.obj vc6/boost_regex-vc6-mt-gd-1_34/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_34/icu.obj vc6/boost_regex-vc6-mt-gd-1_34/instances.obj vc6/boost_regex-vc6-mt-gd-1_34/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_34/regex.obj vc6/boost_regex-vc6-mt-gd-1_34/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_34/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_34/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_34/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_34/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_34/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_34.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_34.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-gd-1_34/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/cregex.obj vc6/boost_regex-vc6-mt-gd-1_34/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_34/icu.obj vc6/boost_regex-vc6-mt-gd-1_34/instances.obj vc6/boost_regex-vc6-mt-gd-1_34/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_34/regex.obj vc6/boost_regex-vc6-mt-gd-1_34/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_34/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_34/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_34/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_34/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_34/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_34/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_34/winstances.obj
+./vc6/boost_regex-vc6-mt-gd-1_35.lib : vc6/boost_regex-vc6-mt-gd-1_35/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/cregex.obj vc6/boost_regex-vc6-mt-gd-1_35/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_35/icu.obj vc6/boost_regex-vc6-mt-gd-1_35/instances.obj vc6/boost_regex-vc6-mt-gd-1_35/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_35/regex.obj vc6/boost_regex-vc6-mt-gd-1_35/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_35/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_35/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_35/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_35/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_35/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_35.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_35.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-gd-1_35/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/cregex.obj vc6/boost_regex-vc6-mt-gd-1_35/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_35/icu.obj vc6/boost_regex-vc6-mt-gd-1_35/instances.obj vc6/boost_regex-vc6-mt-gd-1_35/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_35/regex.obj vc6/boost_regex-vc6-mt-gd-1_35/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_35/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_35/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_35/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_35/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_35/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_35/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc6-mt-1_34.lib
+# section for boost_regex-vc6-mt-1_35.lib
 #
 ########################################################
-vc6/boost_regex-vc6-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc6/boost_regex-vc6-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/boost_regex-vc6-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/cregex.cpp
+vc6/boost_regex-vc6-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/cregex.cpp
 
-vc6/boost_regex-vc6-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/fileiter.cpp
+vc6/boost_regex-vc6-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/fileiter.cpp
 
-vc6/boost_regex-vc6-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/icu.cpp
+vc6/boost_regex-vc6-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/icu.cpp
 
-vc6/boost_regex-vc6-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/instances.cpp
+vc6/boost_regex-vc6-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/instances.cpp
 
-vc6/boost_regex-vc6-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/posix_api.cpp
+vc6/boost_regex-vc6-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/posix_api.cpp
 
-vc6/boost_regex-vc6-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/regex.cpp
+vc6/boost_regex-vc6-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/regex.cpp
 
-vc6/boost_regex-vc6-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/regex_debug.cpp
+vc6/boost_regex-vc6-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/boost_regex-vc6-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/boost_regex-vc6-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/boost_regex-vc6-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/boost_regex-vc6-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/static_mutex.cpp
+vc6/boost_regex-vc6-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc6/boost_regex-vc6-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/usinstances.cpp
+vc6/boost_regex-vc6-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/usinstances.cpp
 
-vc6/boost_regex-vc6-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/boost_regex-vc6-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/boost_regex-vc6-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc6/boost_regex-vc6-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/boost_regex-vc6-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_34/ -Fdvc6/boost_regex-vc6-mt-1_34.pdb ../src/winstances.cpp
+vc6/boost_regex-vc6-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_35/ -Fdvc6/boost_regex-vc6-mt-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc6-mt-1_34_dir :
-	@if not exist "vc6\boost_regex-vc6-mt-1_34\$(NULL)" mkdir vc6\boost_regex-vc6-mt-1_34
+boost_regex-vc6-mt-1_35_dir :
+	@if not exist "vc6\boost_regex-vc6-mt-1_35\$(NULL)" mkdir vc6\boost_regex-vc6-mt-1_35
 
-boost_regex-vc6-mt-1_34_clean :
-	del vc6\boost_regex-vc6-mt-1_34\*.obj
-	del vc6\boost_regex-vc6-mt-1_34\*.idb
-	del vc6\boost_regex-vc6-mt-1_34\*.exp
-	del vc6\boost_regex-vc6-mt-1_34\*.pch
+boost_regex-vc6-mt-1_35_clean :
+	del vc6\boost_regex-vc6-mt-1_35\*.obj
+	del vc6\boost_regex-vc6-mt-1_35\*.idb
+	del vc6\boost_regex-vc6-mt-1_35\*.exp
+	del vc6\boost_regex-vc6-mt-1_35\*.pch
 
-./vc6/boost_regex-vc6-mt-1_34.lib : vc6/boost_regex-vc6-mt-1_34/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/cregex.obj vc6/boost_regex-vc6-mt-1_34/fileiter.obj vc6/boost_regex-vc6-mt-1_34/icu.obj vc6/boost_regex-vc6-mt-1_34/instances.obj vc6/boost_regex-vc6-mt-1_34/posix_api.obj vc6/boost_regex-vc6-mt-1_34/regex.obj vc6/boost_regex-vc6-mt-1_34/regex_debug.obj vc6/boost_regex-vc6-mt-1_34/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_34/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_34/static_mutex.obj vc6/boost_regex-vc6-mt-1_34/usinstances.obj vc6/boost_regex-vc6-mt-1_34/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_34.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_34.dll" /implib:"vc6/boost_regex-vc6-mt-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-1_34/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/cregex.obj vc6/boost_regex-vc6-mt-1_34/fileiter.obj vc6/boost_regex-vc6-mt-1_34/icu.obj vc6/boost_regex-vc6-mt-1_34/instances.obj vc6/boost_regex-vc6-mt-1_34/posix_api.obj vc6/boost_regex-vc6-mt-1_34/regex.obj vc6/boost_regex-vc6-mt-1_34/regex_debug.obj vc6/boost_regex-vc6-mt-1_34/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_34/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_34/static_mutex.obj vc6/boost_regex-vc6-mt-1_34/usinstances.obj vc6/boost_regex-vc6-mt-1_34/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_34/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_34/winstances.obj
+./vc6/boost_regex-vc6-mt-1_35.lib : vc6/boost_regex-vc6-mt-1_35/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/cregex.obj vc6/boost_regex-vc6-mt-1_35/fileiter.obj vc6/boost_regex-vc6-mt-1_35/icu.obj vc6/boost_regex-vc6-mt-1_35/instances.obj vc6/boost_regex-vc6-mt-1_35/posix_api.obj vc6/boost_regex-vc6-mt-1_35/regex.obj vc6/boost_regex-vc6-mt-1_35/regex_debug.obj vc6/boost_regex-vc6-mt-1_35/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_35/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_35/static_mutex.obj vc6/boost_regex-vc6-mt-1_35/usinstances.obj vc6/boost_regex-vc6-mt-1_35/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_35.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_35.dll" /implib:"vc6/boost_regex-vc6-mt-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-1_35/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/cregex.obj vc6/boost_regex-vc6-mt-1_35/fileiter.obj vc6/boost_regex-vc6-mt-1_35/icu.obj vc6/boost_regex-vc6-mt-1_35/instances.obj vc6/boost_regex-vc6-mt-1_35/posix_api.obj vc6/boost_regex-vc6-mt-1_35/regex.obj vc6/boost_regex-vc6-mt-1_35/regex_debug.obj vc6/boost_regex-vc6-mt-1_35/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_35/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_35/static_mutex.obj vc6/boost_regex-vc6-mt-1_35/usinstances.obj vc6/boost_regex-vc6-mt-1_35/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_35/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-1_34.lib
+# section for libboost_regex-vc6-mt-1_35.lib
 #
 ########################################################
-vc6/libboost_regex-vc6-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/cregex.cpp
+vc6/libboost_regex-vc6-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/cregex.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/fileiter.cpp
+vc6/libboost_regex-vc6-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/fileiter.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/icu.cpp
+vc6/libboost_regex-vc6-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/icu.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/instances.cpp
+vc6/libboost_regex-vc6-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/instances.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/posix_api.cpp
+vc6/libboost_regex-vc6-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/regex.cpp
+vc6/libboost_regex-vc6-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/regex.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/regex_debug.cpp
+vc6/libboost_regex-vc6-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/libboost_regex-vc6-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/libboost_regex-vc6-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/static_mutex.cpp
+vc6/libboost_regex-vc6-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/usinstances.cpp
+vc6/libboost_regex-vc6-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/usinstances.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc6/libboost_regex-vc6-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_34/ -Fdvc6/libboost_regex-vc6-mt-1_34.pdb ../src/winstances.cpp
+vc6/libboost_regex-vc6-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_35/ -Fdvc6/libboost_regex-vc6-mt-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-1_34_dir :
-	@if not exist "vc6\libboost_regex-vc6-mt-1_34\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-1_34
+libboost_regex-vc6-mt-1_35_dir :
+	@if not exist "vc6\libboost_regex-vc6-mt-1_35\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-1_35
 
-libboost_regex-vc6-mt-1_34_clean :
-	del vc6\libboost_regex-vc6-mt-1_34\*.obj
-	del vc6\libboost_regex-vc6-mt-1_34\*.idb
-	del vc6\libboost_regex-vc6-mt-1_34\*.exp
-	del vc6\libboost_regex-vc6-mt-1_34\*.pch
+libboost_regex-vc6-mt-1_35_clean :
+	del vc6\libboost_regex-vc6-mt-1_35\*.obj
+	del vc6\libboost_regex-vc6-mt-1_35\*.idb
+	del vc6\libboost_regex-vc6-mt-1_35\*.exp
+	del vc6\libboost_regex-vc6-mt-1_35\*.pch
 
-./vc6/libboost_regex-vc6-mt-1_34.lib : vc6/libboost_regex-vc6-mt-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/cregex.obj vc6/libboost_regex-vc6-mt-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-1_34/icu.obj vc6/libboost_regex-vc6-mt-1_34/instances.obj vc6/libboost_regex-vc6-mt-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-1_34/regex.obj vc6/libboost_regex-vc6-mt-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_34/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_34.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/cregex.obj vc6/libboost_regex-vc6-mt-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-1_34/icu.obj vc6/libboost_regex-vc6-mt-1_34/instances.obj vc6/libboost_regex-vc6-mt-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-1_34/regex.obj vc6/libboost_regex-vc6-mt-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_34/winstances.obj
+./vc6/libboost_regex-vc6-mt-1_35.lib : vc6/libboost_regex-vc6-mt-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/cregex.obj vc6/libboost_regex-vc6-mt-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-1_35/icu.obj vc6/libboost_regex-vc6-mt-1_35/instances.obj vc6/libboost_regex-vc6-mt-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-1_35/regex.obj vc6/libboost_regex-vc6-mt-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_35/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_35.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/cregex.obj vc6/libboost_regex-vc6-mt-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-1_35/icu.obj vc6/libboost_regex-vc6-mt-1_35/instances.obj vc6/libboost_regex-vc6-mt-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-1_35/regex.obj vc6/libboost_regex-vc6-mt-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc6-mt-gd-1_34.lib
+# section for libboost_regex-vc6-mt-gd-1_35.lib
 #
 ########################################################
-vc6/libboost_regex-vc6-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/cregex.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/icu.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/instances.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/regex.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_34/ -Fdvc6/libboost_regex-vc6-mt-gd-1_34.pdb ../src/winstances.cpp
+vc6/libboost_regex-vc6-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_35/ -Fdvc6/libboost_regex-vc6-mt-gd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc6-mt-gd-1_34_dir :
-	@if not exist "vc6\libboost_regex-vc6-mt-gd-1_34\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-gd-1_34
+libboost_regex-vc6-mt-gd-1_35_dir :
+	@if not exist "vc6\libboost_regex-vc6-mt-gd-1_35\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-gd-1_35
 
-libboost_regex-vc6-mt-gd-1_34_clean :
-	del vc6\libboost_regex-vc6-mt-gd-1_34\*.obj
-	del vc6\libboost_regex-vc6-mt-gd-1_34\*.idb
-	del vc6\libboost_regex-vc6-mt-gd-1_34\*.exp
-	del vc6\libboost_regex-vc6-mt-gd-1_34\*.pch
+libboost_regex-vc6-mt-gd-1_35_clean :
+	del vc6\libboost_regex-vc6-mt-gd-1_35\*.obj
+	del vc6\libboost_regex-vc6-mt-gd-1_35\*.idb
+	del vc6\libboost_regex-vc6-mt-gd-1_35\*.exp
+	del vc6\libboost_regex-vc6-mt-gd-1_35\*.pch
 
-./vc6/libboost_regex-vc6-mt-gd-1_34.lib : vc6/libboost_regex-vc6-mt-gd-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_34/icu.obj vc6/libboost_regex-vc6-mt-gd-1_34/instances.obj vc6/libboost_regex-vc6-mt-gd-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_34/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_34.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_34/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_34/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_34/icu.obj vc6/libboost_regex-vc6-mt-gd-1_34/instances.obj vc6/libboost_regex-vc6-mt-gd-1_34/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_34/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_34/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_34/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_34/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_34/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_34/winstances.obj
+./vc6/libboost_regex-vc6-mt-gd-1_35.lib : vc6/libboost_regex-vc6-mt-gd-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_35/icu.obj vc6/libboost_regex-vc6-mt-gd-1_35/instances.obj vc6/libboost_regex-vc6-mt-gd-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_35/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_35.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_35/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_35/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_35/icu.obj vc6/libboost_regex-vc6-mt-gd-1_35/instances.obj vc6/libboost_regex-vc6-mt-gd-1_35/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_35/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_35/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_35/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_35/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_35/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_35/winstances.obj
 
diff --git a/build/vc7-stlport.mak b/build/vc7-stlport.mak
index 975d9546..967b9a7c 100644
--- a/build/vc7-stlport.mak
+++ b/build/vc7-stlport.mak
@@ -60,24 +60,24 @@ ICU_LINK_OPTS= /LIBPATH:"$(ICU_PATH)\lib" icuin.lib icuuc.lib
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : main_dir libboost_regex-vc7-mt-sp-1_34_dir ./vc7-stlport/libboost_regex-vc7-mt-sp-1_34.lib boost_regex-vc7-mt-p-1_34_dir ./vc7-stlport/boost_regex-vc7-mt-p-1_34.lib libboost_regex-vc7-mt-p-1_34_dir ./vc7-stlport/libboost_regex-vc7-mt-p-1_34.lib boost_regex-vc7-mt-gdp-1_34_dir ./vc7-stlport/boost_regex-vc7-mt-gdp-1_34.lib libboost_regex-vc7-mt-sgdp-1_34_dir ./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.lib libboost_regex-vc7-mt-gdp-1_34_dir ./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34.lib
+all : main_dir libboost_regex-vc7-mt-sp-1_35_dir ./vc7-stlport/libboost_regex-vc7-mt-sp-1_35.lib boost_regex-vc7-mt-p-1_35_dir ./vc7-stlport/boost_regex-vc7-mt-p-1_35.lib libboost_regex-vc7-mt-p-1_35_dir ./vc7-stlport/libboost_regex-vc7-mt-p-1_35.lib boost_regex-vc7-mt-gdp-1_35_dir ./vc7-stlport/boost_regex-vc7-mt-gdp-1_35.lib libboost_regex-vc7-mt-sgdp-1_35_dir ./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.lib libboost_regex-vc7-mt-gdp-1_35_dir ./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35.lib
 
-clean :  libboost_regex-vc7-mt-sp-1_34_clean boost_regex-vc7-mt-p-1_34_clean libboost_regex-vc7-mt-p-1_34_clean boost_regex-vc7-mt-gdp-1_34_clean libboost_regex-vc7-mt-sgdp-1_34_clean libboost_regex-vc7-mt-gdp-1_34_clean
+clean :  libboost_regex-vc7-mt-sp-1_35_clean boost_regex-vc7-mt-p-1_35_clean libboost_regex-vc7-mt-p-1_35_clean boost_regex-vc7-mt-gdp-1_35_clean libboost_regex-vc7-mt-sgdp-1_35_clean libboost_regex-vc7-mt-gdp-1_35_clean
 
 install : stlport_check all
-	copy vc7-stlport\libboost_regex-vc7-mt-sp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7-stlport\boost_regex-vc7-mt-p-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7-stlport\boost_regex-vc7-mt-p-1_34.dll "$(MSVCDIR)\bin"
-	copy vc7-stlport\libboost_regex-vc7-mt-p-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7-stlport\boost_regex-vc7-mt-gdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7-stlport\boost_regex-vc7-mt-gdp-1_34.dll "$(MSVCDIR)\bin"
-	copy vc7-stlport\boost_regex-vc7-mt-gdp-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc7-stlport\libboost_regex-vc7-mt-gdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7-stlport\libboost_regex-vc7-mt-gdp-1_34.pdb "$(MSVCDIR)\lib"
+	copy vc7-stlport\libboost_regex-vc7-mt-sp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7-stlport\boost_regex-vc7-mt-p-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7-stlport\boost_regex-vc7-mt-p-1_35.dll "$(MSVCDIR)\bin"
+	copy vc7-stlport\libboost_regex-vc7-mt-p-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7-stlport\boost_regex-vc7-mt-gdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7-stlport\boost_regex-vc7-mt-gdp-1_35.dll "$(MSVCDIR)\bin"
+	copy vc7-stlport\boost_regex-vc7-mt-gdp-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc7-stlport\libboost_regex-vc7-mt-gdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7-stlport\libboost_regex-vc7-mt-gdp-1_35.pdb "$(MSVCDIR)\lib"
 
 main_dir :
 	@if not exist "vc7-stlport\$(NULL)" mkdir vc7-stlport
@@ -88,409 +88,409 @@ stlport_check : "$(STLPORT_PATH)\stlport\string"
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-sp-1_34.lib
+# section for libboost_regex-vc7-mt-sp-1_35.lib
 #
 ########################################################
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/c_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/cregex.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/cregex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/fileiter.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/fileiter.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/icu.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/icu.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/instances.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/instances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/regex.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/regex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/regex_debug.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/static_mutex.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/static_mutex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/usinstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/usinstances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/w32_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/wc_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/wide_posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_34.pdb ../src/winstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-sp-1_34_dir :
-	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sp-1_34\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sp-1_34
+libboost_regex-vc7-mt-sp-1_35_dir :
+	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sp-1_35\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sp-1_35
 
-libboost_regex-vc7-mt-sp-1_34_clean :
-	del vc7-stlport\libboost_regex-vc7-mt-sp-1_34\*.obj
-	del vc7-stlport\libboost_regex-vc7-mt-sp-1_34\*.idb
-	del vc7-stlport\libboost_regex-vc7-mt-sp-1_34\*.exp
-	del vc7-stlport\libboost_regex-vc7-mt-sp-1_34\*.pch
+libboost_regex-vc7-mt-sp-1_35_clean :
+	del vc7-stlport\libboost_regex-vc7-mt-sp-1_35\*.obj
+	del vc7-stlport\libboost_regex-vc7-mt-sp-1_35\*.idb
+	del vc7-stlport\libboost_regex-vc7-mt-sp-1_35\*.exp
+	del vc7-stlport\libboost_regex-vc7-mt-sp-1_35\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sp-1_34.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_34.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_34/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sp-1_35.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_35.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc7-mt-p-1_34.lib
+# section for boost_regex-vc7-mt-p-1_35.lib
 #
 ########################################################
-vc7-stlport/boost_regex-vc7-mt-p-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/c_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/cregex.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/cregex.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/fileiter.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/fileiter.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/icu.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/icu.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/instances.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/instances.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/posix_api.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/posix_api.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/regex.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/regex.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/regex_debug.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/static_mutex.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/static_mutex.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/usinstances.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/usinstances.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/w32_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/wc_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/wide_posix_api.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_34.pdb ../src/winstances.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc7-mt-p-1_34_dir :
-	@if not exist "vc7-stlport\boost_regex-vc7-mt-p-1_34\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-p-1_34
+boost_regex-vc7-mt-p-1_35_dir :
+	@if not exist "vc7-stlport\boost_regex-vc7-mt-p-1_35\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-p-1_35
 
-boost_regex-vc7-mt-p-1_34_clean :
-	del vc7-stlport\boost_regex-vc7-mt-p-1_34\*.obj
-	del vc7-stlport\boost_regex-vc7-mt-p-1_34\*.idb
-	del vc7-stlport\boost_regex-vc7-mt-p-1_34\*.exp
-	del vc7-stlport\boost_regex-vc7-mt-p-1_34\*.pch
+boost_regex-vc7-mt-p-1_35_clean :
+	del vc7-stlport\boost_regex-vc7-mt-p-1_35\*.obj
+	del vc7-stlport\boost_regex-vc7-mt-p-1_35\*.idb
+	del vc7-stlport\boost_regex-vc7-mt-p-1_35\*.exp
+	del vc7-stlport\boost_regex-vc7-mt-p-1_35\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-p-1_34.lib : vc7-stlport/boost_regex-vc7-mt-p-1_34/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_34.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_34.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-p-1_34/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_34/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-p-1_35.lib : vc7-stlport/boost_regex-vc7-mt-p-1_35/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_35.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_35.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-p-1_35/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-p-1_34.lib
+# section for libboost_regex-vc7-mt-p-1_35.lib
 #
 ########################################################
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/c_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/cregex.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/cregex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/fileiter.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/fileiter.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/icu.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/icu.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/instances.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/instances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/regex.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/regex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/regex_debug.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/static_mutex.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/static_mutex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/usinstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/usinstances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/w32_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/wc_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/wide_posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_34.pdb ../src/winstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-p-1_34_dir :
-	@if not exist "vc7-stlport\libboost_regex-vc7-mt-p-1_34\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-p-1_34
+libboost_regex-vc7-mt-p-1_35_dir :
+	@if not exist "vc7-stlport\libboost_regex-vc7-mt-p-1_35\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-p-1_35
 
-libboost_regex-vc7-mt-p-1_34_clean :
-	del vc7-stlport\libboost_regex-vc7-mt-p-1_34\*.obj
-	del vc7-stlport\libboost_regex-vc7-mt-p-1_34\*.idb
-	del vc7-stlport\libboost_regex-vc7-mt-p-1_34\*.exp
-	del vc7-stlport\libboost_regex-vc7-mt-p-1_34\*.pch
+libboost_regex-vc7-mt-p-1_35_clean :
+	del vc7-stlport\libboost_regex-vc7-mt-p-1_35\*.obj
+	del vc7-stlport\libboost_regex-vc7-mt-p-1_35\*.idb
+	del vc7-stlport\libboost_regex-vc7-mt-p-1_35\*.exp
+	del vc7-stlport\libboost_regex-vc7-mt-p-1_35\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-p-1_34.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_34.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_34/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-p-1_35.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_35.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc7-mt-gdp-1_34.lib
+# section for boost_regex-vc7-mt-gdp-1_35.lib
 #
 ########################################################
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/c_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/cregex.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/cregex.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/fileiter.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/fileiter.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/icu.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/icu.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/instances.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/instances.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/posix_api.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/posix_api.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/regex.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/regex.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/regex_debug.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/static_mutex.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/static_mutex.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/usinstances.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/usinstances.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/wide_posix_api.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb ../src/winstances.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc7-mt-gdp-1_34_dir :
-	@if not exist "vc7-stlport\boost_regex-vc7-mt-gdp-1_34\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-gdp-1_34
+boost_regex-vc7-mt-gdp-1_35_dir :
+	@if not exist "vc7-stlport\boost_regex-vc7-mt-gdp-1_35\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-gdp-1_35
 
-boost_regex-vc7-mt-gdp-1_34_clean :
-	del vc7-stlport\boost_regex-vc7-mt-gdp-1_34\*.obj
-	del vc7-stlport\boost_regex-vc7-mt-gdp-1_34\*.idb
-	del vc7-stlport\boost_regex-vc7-mt-gdp-1_34\*.exp
-	del vc7-stlport\boost_regex-vc7-mt-gdp-1_34\*.pch
+boost_regex-vc7-mt-gdp-1_35_clean :
+	del vc7-stlport\boost_regex-vc7-mt-gdp-1_35\*.obj
+	del vc7-stlport\boost_regex-vc7-mt-gdp-1_35\*.idb
+	del vc7-stlport\boost_regex-vc7-mt-gdp-1_35\*.exp
+	del vc7-stlport\boost_regex-vc7-mt-gdp-1_35\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-gdp-1_34.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_34/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_34.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_34.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_34/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_34/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-gdp-1_35.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_35/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_35.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_35.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_35/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-sgdp-1_34.lib
+# section for libboost_regex-vc7-mt-sgdp-1_35.lib
 #
 ########################################################
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/c_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/cregex.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/cregex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/fileiter.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/fileiter.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/icu.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/icu.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/instances.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/instances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/regex.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/regex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/regex_debug.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/static_mutex.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/static_mutex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/usinstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/usinstances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/wide_posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.pdb ../src/winstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-sgdp-1_34_dir :
-	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34
+libboost_regex-vc7-mt-sgdp-1_35_dir :
+	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35
 
-libboost_regex-vc7-mt-sgdp-1_34_clean :
-	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34\*.obj
-	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34\*.idb
-	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34\*.exp
-	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_34\*.pch
+libboost_regex-vc7-mt-sgdp-1_35_clean :
+	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35\*.obj
+	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35\*.idb
+	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35\*.exp
+	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_35\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_34/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-gdp-1_34.lib
+# section for libboost_regex-vc7-mt-gdp-1_35.lib
 #
 ########################################################
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/c_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/cregex.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/cregex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/fileiter.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/fileiter.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/icu.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/icu.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/instances.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/instances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/regex.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/regex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/regex_debug.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/static_mutex.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/static_mutex.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/usinstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/usinstances.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/wide_posix_api.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_34.pdb ../src/winstances.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-gdp-1_34_dir :
-	@if not exist "vc7-stlport\libboost_regex-vc7-mt-gdp-1_34\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-gdp-1_34
+libboost_regex-vc7-mt-gdp-1_35_dir :
+	@if not exist "vc7-stlport\libboost_regex-vc7-mt-gdp-1_35\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-gdp-1_35
 
-libboost_regex-vc7-mt-gdp-1_34_clean :
-	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_34\*.obj
-	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_34\*.idb
-	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_34\*.exp
-	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_34\*.pch
+libboost_regex-vc7-mt-gdp-1_35_clean :
+	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_35\*.obj
+	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_35\*.idb
+	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_35\*.exp
+	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_35\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-gdp-1_34.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_34.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_34/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-gdp-1_35.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_35.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_35/winstances.obj
 
diff --git a/build/vc7.mak b/build/vc7.mak
index e3bc0b37..a5e9984c 100644
--- a/build/vc7.mak
+++ b/build/vc7.mak
@@ -60,27 +60,27 @@ ICU_LINK_OPTS= /LIBPATH:"$(ICU_PATH)\lib" icuin.lib icuuc.lib
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : main_dir libboost_regex-vc7-s-1_34_dir ./vc7/libboost_regex-vc7-s-1_34.lib libboost_regex-vc7-mt-s-1_34_dir ./vc7/libboost_regex-vc7-mt-s-1_34.lib libboost_regex-vc7-sgd-1_34_dir ./vc7/libboost_regex-vc7-sgd-1_34.lib libboost_regex-vc7-mt-sgd-1_34_dir ./vc7/libboost_regex-vc7-mt-sgd-1_34.lib boost_regex-vc7-mt-gd-1_34_dir ./vc7/boost_regex-vc7-mt-gd-1_34.lib boost_regex-vc7-mt-1_34_dir ./vc7/boost_regex-vc7-mt-1_34.lib libboost_regex-vc7-mt-1_34_dir ./vc7/libboost_regex-vc7-mt-1_34.lib libboost_regex-vc7-mt-gd-1_34_dir ./vc7/libboost_regex-vc7-mt-gd-1_34.lib
+all : main_dir libboost_regex-vc7-s-1_35_dir ./vc7/libboost_regex-vc7-s-1_35.lib libboost_regex-vc7-mt-s-1_35_dir ./vc7/libboost_regex-vc7-mt-s-1_35.lib libboost_regex-vc7-sgd-1_35_dir ./vc7/libboost_regex-vc7-sgd-1_35.lib libboost_regex-vc7-mt-sgd-1_35_dir ./vc7/libboost_regex-vc7-mt-sgd-1_35.lib boost_regex-vc7-mt-gd-1_35_dir ./vc7/boost_regex-vc7-mt-gd-1_35.lib boost_regex-vc7-mt-1_35_dir ./vc7/boost_regex-vc7-mt-1_35.lib libboost_regex-vc7-mt-1_35_dir ./vc7/libboost_regex-vc7-mt-1_35.lib libboost_regex-vc7-mt-gd-1_35_dir ./vc7/libboost_regex-vc7-mt-gd-1_35.lib
 
-clean :  libboost_regex-vc7-s-1_34_clean libboost_regex-vc7-mt-s-1_34_clean libboost_regex-vc7-sgd-1_34_clean libboost_regex-vc7-mt-sgd-1_34_clean boost_regex-vc7-mt-gd-1_34_clean boost_regex-vc7-mt-1_34_clean libboost_regex-vc7-mt-1_34_clean libboost_regex-vc7-mt-gd-1_34_clean
+clean :  libboost_regex-vc7-s-1_35_clean libboost_regex-vc7-mt-s-1_35_clean libboost_regex-vc7-sgd-1_35_clean libboost_regex-vc7-mt-sgd-1_35_clean boost_regex-vc7-mt-gd-1_35_clean boost_regex-vc7-mt-1_35_clean libboost_regex-vc7-mt-1_35_clean libboost_regex-vc7-mt-gd-1_35_clean
 
 install : all
-	copy vc7\libboost_regex-vc7-s-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\libboost_regex-vc7-mt-s-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\libboost_regex-vc7-sgd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\libboost_regex-vc7-sgd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc7\libboost_regex-vc7-mt-sgd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\libboost_regex-vc7-mt-sgd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc7\boost_regex-vc7-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\boost_regex-vc7-mt-gd-1_34.dll "$(MSVCDIR)\bin"
-	copy vc7\boost_regex-vc7-mt-gd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc7\boost_regex-vc7-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\boost_regex-vc7-mt-1_34.dll "$(MSVCDIR)\bin"
-	copy vc7\libboost_regex-vc7-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\libboost_regex-vc7-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc7\libboost_regex-vc7-mt-gd-1_34.pdb "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-s-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-mt-s-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-sgd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-sgd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-mt-sgd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-mt-sgd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc7\boost_regex-vc7-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\boost_regex-vc7-mt-gd-1_35.dll "$(MSVCDIR)\bin"
+	copy vc7\boost_regex-vc7-mt-gd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc7\boost_regex-vc7-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\boost_regex-vc7-mt-1_35.dll "$(MSVCDIR)\bin"
+	copy vc7\libboost_regex-vc7-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc7\libboost_regex-vc7-mt-gd-1_35.pdb "$(MSVCDIR)\lib"
 
 main_dir :
 	@if not exist "vc7\$(NULL)" mkdir vc7
@@ -88,545 +88,545 @@ main_dir :
 
 ########################################################
 #
-# section for libboost_regex-vc7-s-1_34.lib
+# section for libboost_regex-vc7-s-1_35.lib
 #
 ########################################################
-vc7/libboost_regex-vc7-s-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/c_regex_traits.cpp
+vc7/libboost_regex-vc7-s-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-s-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/libboost_regex-vc7-s-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/libboost_regex-vc7-s-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/cregex.cpp
+vc7/libboost_regex-vc7-s-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/cregex.cpp
 
-vc7/libboost_regex-vc7-s-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/fileiter.cpp
+vc7/libboost_regex-vc7-s-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/fileiter.cpp
 
-vc7/libboost_regex-vc7-s-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/icu.cpp
+vc7/libboost_regex-vc7-s-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/icu.cpp
 
-vc7/libboost_regex-vc7-s-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/instances.cpp
+vc7/libboost_regex-vc7-s-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/instances.cpp
 
-vc7/libboost_regex-vc7-s-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/posix_api.cpp
+vc7/libboost_regex-vc7-s-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/posix_api.cpp
 
-vc7/libboost_regex-vc7-s-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/regex.cpp
+vc7/libboost_regex-vc7-s-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/regex.cpp
 
-vc7/libboost_regex-vc7-s-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/regex_debug.cpp
+vc7/libboost_regex-vc7-s-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-s-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/libboost_regex-vc7-s-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/libboost_regex-vc7-s-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/libboost_regex-vc7-s-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/libboost_regex-vc7-s-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/static_mutex.cpp
+vc7/libboost_regex-vc7-s-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/static_mutex.cpp
 
-vc7/libboost_regex-vc7-s-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/usinstances.cpp
+vc7/libboost_regex-vc7-s-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/usinstances.cpp
 
-vc7/libboost_regex-vc7-s-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/libboost_regex-vc7-s-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/libboost_regex-vc7-s-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/libboost_regex-vc7-s-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/libboost_regex-vc7-s-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/wide_posix_api.cpp
+vc7/libboost_regex-vc7-s-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/libboost_regex-vc7-s-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_34/ -Fdvc7/libboost_regex-vc7-s-1_34.pdb ../src/winstances.cpp
+vc7/libboost_regex-vc7-s-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_35/ -Fdvc7/libboost_regex-vc7-s-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-s-1_34_dir :
-	@if not exist "vc7\libboost_regex-vc7-s-1_34\$(NULL)" mkdir vc7\libboost_regex-vc7-s-1_34
+libboost_regex-vc7-s-1_35_dir :
+	@if not exist "vc7\libboost_regex-vc7-s-1_35\$(NULL)" mkdir vc7\libboost_regex-vc7-s-1_35
 
-libboost_regex-vc7-s-1_34_clean :
-	del vc7\libboost_regex-vc7-s-1_34\*.obj
-	del vc7\libboost_regex-vc7-s-1_34\*.idb
-	del vc7\libboost_regex-vc7-s-1_34\*.exp
-	del vc7\libboost_regex-vc7-s-1_34\*.pch
+libboost_regex-vc7-s-1_35_clean :
+	del vc7\libboost_regex-vc7-s-1_35\*.obj
+	del vc7\libboost_regex-vc7-s-1_35\*.idb
+	del vc7\libboost_regex-vc7-s-1_35\*.exp
+	del vc7\libboost_regex-vc7-s-1_35\*.pch
 
-./vc7/libboost_regex-vc7-s-1_34.lib : vc7/libboost_regex-vc7-s-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/cregex.obj vc7/libboost_regex-vc7-s-1_34/fileiter.obj vc7/libboost_regex-vc7-s-1_34/icu.obj vc7/libboost_regex-vc7-s-1_34/instances.obj vc7/libboost_regex-vc7-s-1_34/posix_api.obj vc7/libboost_regex-vc7-s-1_34/regex.obj vc7/libboost_regex-vc7-s-1_34/regex_debug.obj vc7/libboost_regex-vc7-s-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_34/static_mutex.obj vc7/libboost_regex-vc7-s-1_34/usinstances.obj vc7/libboost_regex-vc7-s-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_34/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_34.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/cregex.obj vc7/libboost_regex-vc7-s-1_34/fileiter.obj vc7/libboost_regex-vc7-s-1_34/icu.obj vc7/libboost_regex-vc7-s-1_34/instances.obj vc7/libboost_regex-vc7-s-1_34/posix_api.obj vc7/libboost_regex-vc7-s-1_34/regex.obj vc7/libboost_regex-vc7-s-1_34/regex_debug.obj vc7/libboost_regex-vc7-s-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_34/static_mutex.obj vc7/libboost_regex-vc7-s-1_34/usinstances.obj vc7/libboost_regex-vc7-s-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_34/winstances.obj
+./vc7/libboost_regex-vc7-s-1_35.lib : vc7/libboost_regex-vc7-s-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/cregex.obj vc7/libboost_regex-vc7-s-1_35/fileiter.obj vc7/libboost_regex-vc7-s-1_35/icu.obj vc7/libboost_regex-vc7-s-1_35/instances.obj vc7/libboost_regex-vc7-s-1_35/posix_api.obj vc7/libboost_regex-vc7-s-1_35/regex.obj vc7/libboost_regex-vc7-s-1_35/regex_debug.obj vc7/libboost_regex-vc7-s-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_35/static_mutex.obj vc7/libboost_regex-vc7-s-1_35/usinstances.obj vc7/libboost_regex-vc7-s-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_35/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_35.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/cregex.obj vc7/libboost_regex-vc7-s-1_35/fileiter.obj vc7/libboost_regex-vc7-s-1_35/icu.obj vc7/libboost_regex-vc7-s-1_35/instances.obj vc7/libboost_regex-vc7-s-1_35/posix_api.obj vc7/libboost_regex-vc7-s-1_35/regex.obj vc7/libboost_regex-vc7-s-1_35/regex_debug.obj vc7/libboost_regex-vc7-s-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_35/static_mutex.obj vc7/libboost_regex-vc7-s-1_35/usinstances.obj vc7/libboost_regex-vc7-s-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-s-1_34.lib
+# section for libboost_regex-vc7-mt-s-1_35.lib
 #
 ########################################################
-vc7/libboost_regex-vc7-mt-s-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/c_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/cregex.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/cregex.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/fileiter.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/fileiter.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/icu.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/icu.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/instances.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/instances.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/posix_api.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/regex.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/regex.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/regex_debug.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/static_mutex.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/static_mutex.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/usinstances.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/usinstances.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/wide_posix_api.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_34/ -Fdvc7/libboost_regex-vc7-mt-s-1_34.pdb ../src/winstances.cpp
+vc7/libboost_regex-vc7-mt-s-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_35/ -Fdvc7/libboost_regex-vc7-mt-s-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-s-1_34_dir :
-	@if not exist "vc7\libboost_regex-vc7-mt-s-1_34\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-s-1_34
+libboost_regex-vc7-mt-s-1_35_dir :
+	@if not exist "vc7\libboost_regex-vc7-mt-s-1_35\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-s-1_35
 
-libboost_regex-vc7-mt-s-1_34_clean :
-	del vc7\libboost_regex-vc7-mt-s-1_34\*.obj
-	del vc7\libboost_regex-vc7-mt-s-1_34\*.idb
-	del vc7\libboost_regex-vc7-mt-s-1_34\*.exp
-	del vc7\libboost_regex-vc7-mt-s-1_34\*.pch
+libboost_regex-vc7-mt-s-1_35_clean :
+	del vc7\libboost_regex-vc7-mt-s-1_35\*.obj
+	del vc7\libboost_regex-vc7-mt-s-1_35\*.idb
+	del vc7\libboost_regex-vc7-mt-s-1_35\*.exp
+	del vc7\libboost_regex-vc7-mt-s-1_35\*.pch
 
-./vc7/libboost_regex-vc7-mt-s-1_34.lib : vc7/libboost_regex-vc7-mt-s-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/cregex.obj vc7/libboost_regex-vc7-mt-s-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_34/icu.obj vc7/libboost_regex-vc7-mt-s-1_34/instances.obj vc7/libboost_regex-vc7-mt-s-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_34/regex.obj vc7/libboost_regex-vc7-mt-s-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_34/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_34.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/cregex.obj vc7/libboost_regex-vc7-mt-s-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_34/icu.obj vc7/libboost_regex-vc7-mt-s-1_34/instances.obj vc7/libboost_regex-vc7-mt-s-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_34/regex.obj vc7/libboost_regex-vc7-mt-s-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_34/winstances.obj
+./vc7/libboost_regex-vc7-mt-s-1_35.lib : vc7/libboost_regex-vc7-mt-s-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/cregex.obj vc7/libboost_regex-vc7-mt-s-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_35/icu.obj vc7/libboost_regex-vc7-mt-s-1_35/instances.obj vc7/libboost_regex-vc7-mt-s-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_35/regex.obj vc7/libboost_regex-vc7-mt-s-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_35/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_35.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/cregex.obj vc7/libboost_regex-vc7-mt-s-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_35/icu.obj vc7/libboost_regex-vc7-mt-s-1_35/instances.obj vc7/libboost_regex-vc7-mt-s-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_35/regex.obj vc7/libboost_regex-vc7-mt-s-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-sgd-1_34.lib
+# section for libboost_regex-vc7-sgd-1_35.lib
 #
 ########################################################
-vc7/libboost_regex-vc7-sgd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/c_regex_traits.cpp
+vc7/libboost_regex-vc7-sgd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/libboost_regex-vc7-sgd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/cregex.cpp
+vc7/libboost_regex-vc7-sgd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/cregex.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/fileiter.cpp
+vc7/libboost_regex-vc7-sgd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/fileiter.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/icu.cpp
+vc7/libboost_regex-vc7-sgd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/icu.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/instances.cpp
+vc7/libboost_regex-vc7-sgd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/instances.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/posix_api.cpp
+vc7/libboost_regex-vc7-sgd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/posix_api.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/regex.cpp
+vc7/libboost_regex-vc7-sgd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/regex.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/regex_debug.cpp
+vc7/libboost_regex-vc7-sgd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/libboost_regex-vc7-sgd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/libboost_regex-vc7-sgd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/static_mutex.cpp
+vc7/libboost_regex-vc7-sgd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/static_mutex.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/usinstances.cpp
+vc7/libboost_regex-vc7-sgd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/usinstances.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/libboost_regex-vc7-sgd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/libboost_regex-vc7-sgd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/wide_posix_api.cpp
+vc7/libboost_regex-vc7-sgd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/libboost_regex-vc7-sgd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_34/ -Fdvc7/libboost_regex-vc7-sgd-1_34.pdb ../src/winstances.cpp
+vc7/libboost_regex-vc7-sgd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_35/ -Fdvc7/libboost_regex-vc7-sgd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-sgd-1_34_dir :
-	@if not exist "vc7\libboost_regex-vc7-sgd-1_34\$(NULL)" mkdir vc7\libboost_regex-vc7-sgd-1_34
+libboost_regex-vc7-sgd-1_35_dir :
+	@if not exist "vc7\libboost_regex-vc7-sgd-1_35\$(NULL)" mkdir vc7\libboost_regex-vc7-sgd-1_35
 
-libboost_regex-vc7-sgd-1_34_clean :
-	del vc7\libboost_regex-vc7-sgd-1_34\*.obj
-	del vc7\libboost_regex-vc7-sgd-1_34\*.idb
-	del vc7\libboost_regex-vc7-sgd-1_34\*.exp
-	del vc7\libboost_regex-vc7-sgd-1_34\*.pch
+libboost_regex-vc7-sgd-1_35_clean :
+	del vc7\libboost_regex-vc7-sgd-1_35\*.obj
+	del vc7\libboost_regex-vc7-sgd-1_35\*.idb
+	del vc7\libboost_regex-vc7-sgd-1_35\*.exp
+	del vc7\libboost_regex-vc7-sgd-1_35\*.pch
 
-./vc7/libboost_regex-vc7-sgd-1_34.lib : vc7/libboost_regex-vc7-sgd-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/cregex.obj vc7/libboost_regex-vc7-sgd-1_34/fileiter.obj vc7/libboost_regex-vc7-sgd-1_34/icu.obj vc7/libboost_regex-vc7-sgd-1_34/instances.obj vc7/libboost_regex-vc7-sgd-1_34/posix_api.obj vc7/libboost_regex-vc7-sgd-1_34/regex.obj vc7/libboost_regex-vc7-sgd-1_34/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_34/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_34/usinstances.obj vc7/libboost_regex-vc7-sgd-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_34/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_34.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/cregex.obj vc7/libboost_regex-vc7-sgd-1_34/fileiter.obj vc7/libboost_regex-vc7-sgd-1_34/icu.obj vc7/libboost_regex-vc7-sgd-1_34/instances.obj vc7/libboost_regex-vc7-sgd-1_34/posix_api.obj vc7/libboost_regex-vc7-sgd-1_34/regex.obj vc7/libboost_regex-vc7-sgd-1_34/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_34/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_34/usinstances.obj vc7/libboost_regex-vc7-sgd-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_34/winstances.obj
+./vc7/libboost_regex-vc7-sgd-1_35.lib : vc7/libboost_regex-vc7-sgd-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/cregex.obj vc7/libboost_regex-vc7-sgd-1_35/fileiter.obj vc7/libboost_regex-vc7-sgd-1_35/icu.obj vc7/libboost_regex-vc7-sgd-1_35/instances.obj vc7/libboost_regex-vc7-sgd-1_35/posix_api.obj vc7/libboost_regex-vc7-sgd-1_35/regex.obj vc7/libboost_regex-vc7-sgd-1_35/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_35/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_35/usinstances.obj vc7/libboost_regex-vc7-sgd-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_35/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_35.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/cregex.obj vc7/libboost_regex-vc7-sgd-1_35/fileiter.obj vc7/libboost_regex-vc7-sgd-1_35/icu.obj vc7/libboost_regex-vc7-sgd-1_35/instances.obj vc7/libboost_regex-vc7-sgd-1_35/posix_api.obj vc7/libboost_regex-vc7-sgd-1_35/regex.obj vc7/libboost_regex-vc7-sgd-1_35/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_35/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_35/usinstances.obj vc7/libboost_regex-vc7-sgd-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-sgd-1_34.lib
+# section for libboost_regex-vc7-mt-sgd-1_35.lib
 #
 ########################################################
-vc7/libboost_regex-vc7-mt-sgd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/c_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/cregex.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/cregex.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/fileiter.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/fileiter.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/icu.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/icu.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/instances.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/instances.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/posix_api.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/regex.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/regex.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/regex_debug.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/static_mutex.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/static_mutex.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/usinstances.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/usinstances.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/wide_posix_api.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_34/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_34.pdb ../src/winstances.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_35/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-sgd-1_34_dir :
-	@if not exist "vc7\libboost_regex-vc7-mt-sgd-1_34\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-sgd-1_34
+libboost_regex-vc7-mt-sgd-1_35_dir :
+	@if not exist "vc7\libboost_regex-vc7-mt-sgd-1_35\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-sgd-1_35
 
-libboost_regex-vc7-mt-sgd-1_34_clean :
-	del vc7\libboost_regex-vc7-mt-sgd-1_34\*.obj
-	del vc7\libboost_regex-vc7-mt-sgd-1_34\*.idb
-	del vc7\libboost_regex-vc7-mt-sgd-1_34\*.exp
-	del vc7\libboost_regex-vc7-mt-sgd-1_34\*.pch
+libboost_regex-vc7-mt-sgd-1_35_clean :
+	del vc7\libboost_regex-vc7-mt-sgd-1_35\*.obj
+	del vc7\libboost_regex-vc7-mt-sgd-1_35\*.idb
+	del vc7\libboost_regex-vc7-mt-sgd-1_35\*.exp
+	del vc7\libboost_regex-vc7-mt-sgd-1_35\*.pch
 
-./vc7/libboost_regex-vc7-mt-sgd-1_34.lib : vc7/libboost_regex-vc7-mt-sgd-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_34/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_34/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_34/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_34.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_34/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_34/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_34/winstances.obj
+./vc7/libboost_regex-vc7-mt-sgd-1_35.lib : vc7/libboost_regex-vc7-mt-sgd-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_35/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_35/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_35/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_35.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_35/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_35/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc7-mt-gd-1_34.lib
+# section for boost_regex-vc7-mt-gd-1_35.lib
 #
 ########################################################
-vc7/boost_regex-vc7-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/cregex.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/icu.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/instances.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/regex.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_34/ -Fdvc7/boost_regex-vc7-mt-gd-1_34.pdb ../src/winstances.cpp
+vc7/boost_regex-vc7-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_35/ -Fdvc7/boost_regex-vc7-mt-gd-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc7-mt-gd-1_34_dir :
-	@if not exist "vc7\boost_regex-vc7-mt-gd-1_34\$(NULL)" mkdir vc7\boost_regex-vc7-mt-gd-1_34
+boost_regex-vc7-mt-gd-1_35_dir :
+	@if not exist "vc7\boost_regex-vc7-mt-gd-1_35\$(NULL)" mkdir vc7\boost_regex-vc7-mt-gd-1_35
 
-boost_regex-vc7-mt-gd-1_34_clean :
-	del vc7\boost_regex-vc7-mt-gd-1_34\*.obj
-	del vc7\boost_regex-vc7-mt-gd-1_34\*.idb
-	del vc7\boost_regex-vc7-mt-gd-1_34\*.exp
-	del vc7\boost_regex-vc7-mt-gd-1_34\*.pch
+boost_regex-vc7-mt-gd-1_35_clean :
+	del vc7\boost_regex-vc7-mt-gd-1_35\*.obj
+	del vc7\boost_regex-vc7-mt-gd-1_35\*.idb
+	del vc7\boost_regex-vc7-mt-gd-1_35\*.exp
+	del vc7\boost_regex-vc7-mt-gd-1_35\*.pch
 
-./vc7/boost_regex-vc7-mt-gd-1_34.lib : vc7/boost_regex-vc7-mt-gd-1_34/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/cregex.obj vc7/boost_regex-vc7-mt-gd-1_34/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_34/icu.obj vc7/boost_regex-vc7-mt-gd-1_34/instances.obj vc7/boost_regex-vc7-mt-gd-1_34/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_34/regex.obj vc7/boost_regex-vc7-mt-gd-1_34/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_34/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_34/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_34/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_34/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_34/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_34.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_34.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-gd-1_34/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/cregex.obj vc7/boost_regex-vc7-mt-gd-1_34/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_34/icu.obj vc7/boost_regex-vc7-mt-gd-1_34/instances.obj vc7/boost_regex-vc7-mt-gd-1_34/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_34/regex.obj vc7/boost_regex-vc7-mt-gd-1_34/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_34/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_34/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_34/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_34/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_34/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_34/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_34/winstances.obj
+./vc7/boost_regex-vc7-mt-gd-1_35.lib : vc7/boost_regex-vc7-mt-gd-1_35/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/cregex.obj vc7/boost_regex-vc7-mt-gd-1_35/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_35/icu.obj vc7/boost_regex-vc7-mt-gd-1_35/instances.obj vc7/boost_regex-vc7-mt-gd-1_35/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_35/regex.obj vc7/boost_regex-vc7-mt-gd-1_35/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_35/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_35/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_35/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_35/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_35/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_35.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_35.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-gd-1_35/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/cregex.obj vc7/boost_regex-vc7-mt-gd-1_35/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_35/icu.obj vc7/boost_regex-vc7-mt-gd-1_35/instances.obj vc7/boost_regex-vc7-mt-gd-1_35/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_35/regex.obj vc7/boost_regex-vc7-mt-gd-1_35/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_35/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_35/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_35/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_35/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_35/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_35/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc7-mt-1_34.lib
+# section for boost_regex-vc7-mt-1_35.lib
 #
 ########################################################
-vc7/boost_regex-vc7-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc7/boost_regex-vc7-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/boost_regex-vc7-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/cregex.cpp
+vc7/boost_regex-vc7-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/cregex.cpp
 
-vc7/boost_regex-vc7-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/fileiter.cpp
+vc7/boost_regex-vc7-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/fileiter.cpp
 
-vc7/boost_regex-vc7-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/icu.cpp
+vc7/boost_regex-vc7-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/icu.cpp
 
-vc7/boost_regex-vc7-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/instances.cpp
+vc7/boost_regex-vc7-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/instances.cpp
 
-vc7/boost_regex-vc7-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/posix_api.cpp
+vc7/boost_regex-vc7-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/posix_api.cpp
 
-vc7/boost_regex-vc7-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/regex.cpp
+vc7/boost_regex-vc7-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/regex.cpp
 
-vc7/boost_regex-vc7-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/regex_debug.cpp
+vc7/boost_regex-vc7-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/boost_regex-vc7-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/boost_regex-vc7-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/boost_regex-vc7-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/boost_regex-vc7-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/static_mutex.cpp
+vc7/boost_regex-vc7-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc7/boost_regex-vc7-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/usinstances.cpp
+vc7/boost_regex-vc7-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/usinstances.cpp
 
-vc7/boost_regex-vc7-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/boost_regex-vc7-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/boost_regex-vc7-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc7/boost_regex-vc7-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/boost_regex-vc7-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_34/ -Fdvc7/boost_regex-vc7-mt-1_34.pdb ../src/winstances.cpp
+vc7/boost_regex-vc7-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_35/ -Fdvc7/boost_regex-vc7-mt-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc7-mt-1_34_dir :
-	@if not exist "vc7\boost_regex-vc7-mt-1_34\$(NULL)" mkdir vc7\boost_regex-vc7-mt-1_34
+boost_regex-vc7-mt-1_35_dir :
+	@if not exist "vc7\boost_regex-vc7-mt-1_35\$(NULL)" mkdir vc7\boost_regex-vc7-mt-1_35
 
-boost_regex-vc7-mt-1_34_clean :
-	del vc7\boost_regex-vc7-mt-1_34\*.obj
-	del vc7\boost_regex-vc7-mt-1_34\*.idb
-	del vc7\boost_regex-vc7-mt-1_34\*.exp
-	del vc7\boost_regex-vc7-mt-1_34\*.pch
+boost_regex-vc7-mt-1_35_clean :
+	del vc7\boost_regex-vc7-mt-1_35\*.obj
+	del vc7\boost_regex-vc7-mt-1_35\*.idb
+	del vc7\boost_regex-vc7-mt-1_35\*.exp
+	del vc7\boost_regex-vc7-mt-1_35\*.pch
 
-./vc7/boost_regex-vc7-mt-1_34.lib : vc7/boost_regex-vc7-mt-1_34/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/cregex.obj vc7/boost_regex-vc7-mt-1_34/fileiter.obj vc7/boost_regex-vc7-mt-1_34/icu.obj vc7/boost_regex-vc7-mt-1_34/instances.obj vc7/boost_regex-vc7-mt-1_34/posix_api.obj vc7/boost_regex-vc7-mt-1_34/regex.obj vc7/boost_regex-vc7-mt-1_34/regex_debug.obj vc7/boost_regex-vc7-mt-1_34/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_34/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_34/static_mutex.obj vc7/boost_regex-vc7-mt-1_34/usinstances.obj vc7/boost_regex-vc7-mt-1_34/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_34.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_34.dll" /implib:"vc7/boost_regex-vc7-mt-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-1_34/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/cregex.obj vc7/boost_regex-vc7-mt-1_34/fileiter.obj vc7/boost_regex-vc7-mt-1_34/icu.obj vc7/boost_regex-vc7-mt-1_34/instances.obj vc7/boost_regex-vc7-mt-1_34/posix_api.obj vc7/boost_regex-vc7-mt-1_34/regex.obj vc7/boost_regex-vc7-mt-1_34/regex_debug.obj vc7/boost_regex-vc7-mt-1_34/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_34/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_34/static_mutex.obj vc7/boost_regex-vc7-mt-1_34/usinstances.obj vc7/boost_regex-vc7-mt-1_34/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_34/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_34/winstances.obj
+./vc7/boost_regex-vc7-mt-1_35.lib : vc7/boost_regex-vc7-mt-1_35/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/cregex.obj vc7/boost_regex-vc7-mt-1_35/fileiter.obj vc7/boost_regex-vc7-mt-1_35/icu.obj vc7/boost_regex-vc7-mt-1_35/instances.obj vc7/boost_regex-vc7-mt-1_35/posix_api.obj vc7/boost_regex-vc7-mt-1_35/regex.obj vc7/boost_regex-vc7-mt-1_35/regex_debug.obj vc7/boost_regex-vc7-mt-1_35/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_35/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_35/static_mutex.obj vc7/boost_regex-vc7-mt-1_35/usinstances.obj vc7/boost_regex-vc7-mt-1_35/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_35.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_35.dll" /implib:"vc7/boost_regex-vc7-mt-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-1_35/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/cregex.obj vc7/boost_regex-vc7-mt-1_35/fileiter.obj vc7/boost_regex-vc7-mt-1_35/icu.obj vc7/boost_regex-vc7-mt-1_35/instances.obj vc7/boost_regex-vc7-mt-1_35/posix_api.obj vc7/boost_regex-vc7-mt-1_35/regex.obj vc7/boost_regex-vc7-mt-1_35/regex_debug.obj vc7/boost_regex-vc7-mt-1_35/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_35/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_35/static_mutex.obj vc7/boost_regex-vc7-mt-1_35/usinstances.obj vc7/boost_regex-vc7-mt-1_35/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_35/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-1_34.lib
+# section for libboost_regex-vc7-mt-1_35.lib
 #
 ########################################################
-vc7/libboost_regex-vc7-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/cregex.cpp
+vc7/libboost_regex-vc7-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/cregex.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/fileiter.cpp
+vc7/libboost_regex-vc7-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/fileiter.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/icu.cpp
+vc7/libboost_regex-vc7-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/icu.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/instances.cpp
+vc7/libboost_regex-vc7-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/instances.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/posix_api.cpp
+vc7/libboost_regex-vc7-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/regex.cpp
+vc7/libboost_regex-vc7-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/regex.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/regex_debug.cpp
+vc7/libboost_regex-vc7-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/libboost_regex-vc7-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/libboost_regex-vc7-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/static_mutex.cpp
+vc7/libboost_regex-vc7-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/usinstances.cpp
+vc7/libboost_regex-vc7-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/usinstances.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc7/libboost_regex-vc7-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_34/ -Fdvc7/libboost_regex-vc7-mt-1_34.pdb ../src/winstances.cpp
+vc7/libboost_regex-vc7-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_35/ -Fdvc7/libboost_regex-vc7-mt-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-1_34_dir :
-	@if not exist "vc7\libboost_regex-vc7-mt-1_34\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-1_34
+libboost_regex-vc7-mt-1_35_dir :
+	@if not exist "vc7\libboost_regex-vc7-mt-1_35\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-1_35
 
-libboost_regex-vc7-mt-1_34_clean :
-	del vc7\libboost_regex-vc7-mt-1_34\*.obj
-	del vc7\libboost_regex-vc7-mt-1_34\*.idb
-	del vc7\libboost_regex-vc7-mt-1_34\*.exp
-	del vc7\libboost_regex-vc7-mt-1_34\*.pch
+libboost_regex-vc7-mt-1_35_clean :
+	del vc7\libboost_regex-vc7-mt-1_35\*.obj
+	del vc7\libboost_regex-vc7-mt-1_35\*.idb
+	del vc7\libboost_regex-vc7-mt-1_35\*.exp
+	del vc7\libboost_regex-vc7-mt-1_35\*.pch
 
-./vc7/libboost_regex-vc7-mt-1_34.lib : vc7/libboost_regex-vc7-mt-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/cregex.obj vc7/libboost_regex-vc7-mt-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-1_34/icu.obj vc7/libboost_regex-vc7-mt-1_34/instances.obj vc7/libboost_regex-vc7-mt-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-1_34/regex.obj vc7/libboost_regex-vc7-mt-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_34/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_34.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/cregex.obj vc7/libboost_regex-vc7-mt-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-1_34/icu.obj vc7/libboost_regex-vc7-mt-1_34/instances.obj vc7/libboost_regex-vc7-mt-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-1_34/regex.obj vc7/libboost_regex-vc7-mt-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_34/winstances.obj
+./vc7/libboost_regex-vc7-mt-1_35.lib : vc7/libboost_regex-vc7-mt-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/cregex.obj vc7/libboost_regex-vc7-mt-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-1_35/icu.obj vc7/libboost_regex-vc7-mt-1_35/instances.obj vc7/libboost_regex-vc7-mt-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-1_35/regex.obj vc7/libboost_regex-vc7-mt-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_35/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_35.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/cregex.obj vc7/libboost_regex-vc7-mt-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-1_35/icu.obj vc7/libboost_regex-vc7-mt-1_35/instances.obj vc7/libboost_regex-vc7-mt-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-1_35/regex.obj vc7/libboost_regex-vc7-mt-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc7-mt-gd-1_34.lib
+# section for libboost_regex-vc7-mt-gd-1_35.lib
 #
 ########################################################
-vc7/libboost_regex-vc7-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/cregex.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/icu.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/instances.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/regex.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_34/ -Fdvc7/libboost_regex-vc7-mt-gd-1_34.pdb ../src/winstances.cpp
+vc7/libboost_regex-vc7-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_35/ -Fdvc7/libboost_regex-vc7-mt-gd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc7-mt-gd-1_34_dir :
-	@if not exist "vc7\libboost_regex-vc7-mt-gd-1_34\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-gd-1_34
+libboost_regex-vc7-mt-gd-1_35_dir :
+	@if not exist "vc7\libboost_regex-vc7-mt-gd-1_35\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-gd-1_35
 
-libboost_regex-vc7-mt-gd-1_34_clean :
-	del vc7\libboost_regex-vc7-mt-gd-1_34\*.obj
-	del vc7\libboost_regex-vc7-mt-gd-1_34\*.idb
-	del vc7\libboost_regex-vc7-mt-gd-1_34\*.exp
-	del vc7\libboost_regex-vc7-mt-gd-1_34\*.pch
+libboost_regex-vc7-mt-gd-1_35_clean :
+	del vc7\libboost_regex-vc7-mt-gd-1_35\*.obj
+	del vc7\libboost_regex-vc7-mt-gd-1_35\*.idb
+	del vc7\libboost_regex-vc7-mt-gd-1_35\*.exp
+	del vc7\libboost_regex-vc7-mt-gd-1_35\*.pch
 
-./vc7/libboost_regex-vc7-mt-gd-1_34.lib : vc7/libboost_regex-vc7-mt-gd-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_34/icu.obj vc7/libboost_regex-vc7-mt-gd-1_34/instances.obj vc7/libboost_regex-vc7-mt-gd-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_34/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_34.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_34/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_34/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_34/icu.obj vc7/libboost_regex-vc7-mt-gd-1_34/instances.obj vc7/libboost_regex-vc7-mt-gd-1_34/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_34/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_34/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_34/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_34/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_34/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_34/winstances.obj
+./vc7/libboost_regex-vc7-mt-gd-1_35.lib : vc7/libboost_regex-vc7-mt-gd-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_35/icu.obj vc7/libboost_regex-vc7-mt-gd-1_35/instances.obj vc7/libboost_regex-vc7-mt-gd-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_35/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_35.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_35/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_35/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_35/icu.obj vc7/libboost_regex-vc7-mt-gd-1_35/instances.obj vc7/libboost_regex-vc7-mt-gd-1_35/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_35/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_35/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_35/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_35/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_35/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_35/winstances.obj
 
diff --git a/build/vc71-stlport.mak b/build/vc71-stlport.mak
index af834a76..264b449c 100644
--- a/build/vc71-stlport.mak
+++ b/build/vc71-stlport.mak
@@ -60,24 +60,24 @@ ICU_LINK_OPTS= /LIBPATH:"$(ICU_PATH)\lib" icuin.lib icuuc.lib
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : main_dir libboost_regex-vc71-mt-sp-1_34_dir ./vc71-stlport/libboost_regex-vc71-mt-sp-1_34.lib boost_regex-vc71-mt-p-1_34_dir ./vc71-stlport/boost_regex-vc71-mt-p-1_34.lib libboost_regex-vc71-mt-p-1_34_dir ./vc71-stlport/libboost_regex-vc71-mt-p-1_34.lib boost_regex-vc71-mt-gdp-1_34_dir ./vc71-stlport/boost_regex-vc71-mt-gdp-1_34.lib libboost_regex-vc71-mt-sgdp-1_34_dir ./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.lib libboost_regex-vc71-mt-gdp-1_34_dir ./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34.lib
+all : main_dir libboost_regex-vc71-mt-sp-1_35_dir ./vc71-stlport/libboost_regex-vc71-mt-sp-1_35.lib boost_regex-vc71-mt-p-1_35_dir ./vc71-stlport/boost_regex-vc71-mt-p-1_35.lib libboost_regex-vc71-mt-p-1_35_dir ./vc71-stlport/libboost_regex-vc71-mt-p-1_35.lib boost_regex-vc71-mt-gdp-1_35_dir ./vc71-stlport/boost_regex-vc71-mt-gdp-1_35.lib libboost_regex-vc71-mt-sgdp-1_35_dir ./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.lib libboost_regex-vc71-mt-gdp-1_35_dir ./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35.lib
 
-clean :  libboost_regex-vc71-mt-sp-1_34_clean boost_regex-vc71-mt-p-1_34_clean libboost_regex-vc71-mt-p-1_34_clean boost_regex-vc71-mt-gdp-1_34_clean libboost_regex-vc71-mt-sgdp-1_34_clean libboost_regex-vc71-mt-gdp-1_34_clean
+clean :  libboost_regex-vc71-mt-sp-1_35_clean boost_regex-vc71-mt-p-1_35_clean libboost_regex-vc71-mt-p-1_35_clean boost_regex-vc71-mt-gdp-1_35_clean libboost_regex-vc71-mt-sgdp-1_35_clean libboost_regex-vc71-mt-gdp-1_35_clean
 
 install : stlport_check all
-	copy vc71-stlport\libboost_regex-vc71-mt-sp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71-stlport\boost_regex-vc71-mt-p-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71-stlport\boost_regex-vc71-mt-p-1_34.dll "$(MSVCDIR)\bin"
-	copy vc71-stlport\libboost_regex-vc71-mt-p-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71-stlport\boost_regex-vc71-mt-gdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71-stlport\boost_regex-vc71-mt-gdp-1_34.dll "$(MSVCDIR)\bin"
-	copy vc71-stlport\boost_regex-vc71-mt-gdp-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc71-stlport\libboost_regex-vc71-mt-gdp-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71-stlport\libboost_regex-vc71-mt-gdp-1_34.pdb "$(MSVCDIR)\lib"
+	copy vc71-stlport\libboost_regex-vc71-mt-sp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71-stlport\boost_regex-vc71-mt-p-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71-stlport\boost_regex-vc71-mt-p-1_35.dll "$(MSVCDIR)\bin"
+	copy vc71-stlport\libboost_regex-vc71-mt-p-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71-stlport\boost_regex-vc71-mt-gdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71-stlport\boost_regex-vc71-mt-gdp-1_35.dll "$(MSVCDIR)\bin"
+	copy vc71-stlport\boost_regex-vc71-mt-gdp-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc71-stlport\libboost_regex-vc71-mt-gdp-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71-stlport\libboost_regex-vc71-mt-gdp-1_35.pdb "$(MSVCDIR)\lib"
 
 main_dir :
 	@if not exist "vc71-stlport\$(NULL)" mkdir vc71-stlport
@@ -88,409 +88,409 @@ stlport_check : "$(STLPORT_PATH)\stlport\string"
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-sp-1_34.lib
+# section for libboost_regex-vc71-mt-sp-1_35.lib
 #
 ########################################################
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/c_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/cregex.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/cregex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/fileiter.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/fileiter.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/icu.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/icu.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/instances.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/instances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/regex.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/regex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/regex_debug.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/static_mutex.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/static_mutex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/usinstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/usinstances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/w32_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/wc_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/wide_posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_34.pdb ../src/winstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-sp-1_34_dir :
-	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sp-1_34\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sp-1_34
+libboost_regex-vc71-mt-sp-1_35_dir :
+	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sp-1_35\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sp-1_35
 
-libboost_regex-vc71-mt-sp-1_34_clean :
-	del vc71-stlport\libboost_regex-vc71-mt-sp-1_34\*.obj
-	del vc71-stlport\libboost_regex-vc71-mt-sp-1_34\*.idb
-	del vc71-stlport\libboost_regex-vc71-mt-sp-1_34\*.exp
-	del vc71-stlport\libboost_regex-vc71-mt-sp-1_34\*.pch
+libboost_regex-vc71-mt-sp-1_35_clean :
+	del vc71-stlport\libboost_regex-vc71-mt-sp-1_35\*.obj
+	del vc71-stlport\libboost_regex-vc71-mt-sp-1_35\*.idb
+	del vc71-stlport\libboost_regex-vc71-mt-sp-1_35\*.exp
+	del vc71-stlport\libboost_regex-vc71-mt-sp-1_35\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sp-1_34.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_34.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_34/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sp-1_35.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_35.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc71-mt-p-1_34.lib
+# section for boost_regex-vc71-mt-p-1_35.lib
 #
 ########################################################
-vc71-stlport/boost_regex-vc71-mt-p-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/c_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/cregex.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/cregex.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/fileiter.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/fileiter.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/icu.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/icu.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/instances.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/instances.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/posix_api.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/posix_api.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/regex.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/regex.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/regex_debug.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/static_mutex.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/static_mutex.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/usinstances.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/usinstances.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/w32_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/wc_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/wide_posix_api.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_34.pdb ../src/winstances.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I"$(STLPORT_PATH)\stlport" /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc71-mt-p-1_34_dir :
-	@if not exist "vc71-stlport\boost_regex-vc71-mt-p-1_34\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-p-1_34
+boost_regex-vc71-mt-p-1_35_dir :
+	@if not exist "vc71-stlport\boost_regex-vc71-mt-p-1_35\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-p-1_35
 
-boost_regex-vc71-mt-p-1_34_clean :
-	del vc71-stlport\boost_regex-vc71-mt-p-1_34\*.obj
-	del vc71-stlport\boost_regex-vc71-mt-p-1_34\*.idb
-	del vc71-stlport\boost_regex-vc71-mt-p-1_34\*.exp
-	del vc71-stlport\boost_regex-vc71-mt-p-1_34\*.pch
+boost_regex-vc71-mt-p-1_35_clean :
+	del vc71-stlport\boost_regex-vc71-mt-p-1_35\*.obj
+	del vc71-stlport\boost_regex-vc71-mt-p-1_35\*.idb
+	del vc71-stlport\boost_regex-vc71-mt-p-1_35\*.exp
+	del vc71-stlport\boost_regex-vc71-mt-p-1_35\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-p-1_34.lib : vc71-stlport/boost_regex-vc71-mt-p-1_34/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_34.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_34.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-p-1_34/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_34/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-p-1_35.lib : vc71-stlport/boost_regex-vc71-mt-p-1_35/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_35.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_35.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-p-1_35/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-p-1_34.lib
+# section for libboost_regex-vc71-mt-p-1_35.lib
 #
 ########################################################
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/c_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/cregex.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/cregex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/fileiter.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/fileiter.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/icu.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/icu.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/instances.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/instances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/regex.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/regex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/regex_debug.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/static_mutex.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/static_mutex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/usinstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/usinstances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/w32_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/wc_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/wide_posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_34.pdb ../src/winstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-p-1_34_dir :
-	@if not exist "vc71-stlport\libboost_regex-vc71-mt-p-1_34\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-p-1_34
+libboost_regex-vc71-mt-p-1_35_dir :
+	@if not exist "vc71-stlport\libboost_regex-vc71-mt-p-1_35\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-p-1_35
 
-libboost_regex-vc71-mt-p-1_34_clean :
-	del vc71-stlport\libboost_regex-vc71-mt-p-1_34\*.obj
-	del vc71-stlport\libboost_regex-vc71-mt-p-1_34\*.idb
-	del vc71-stlport\libboost_regex-vc71-mt-p-1_34\*.exp
-	del vc71-stlport\libboost_regex-vc71-mt-p-1_34\*.pch
+libboost_regex-vc71-mt-p-1_35_clean :
+	del vc71-stlport\libboost_regex-vc71-mt-p-1_35\*.obj
+	del vc71-stlport\libboost_regex-vc71-mt-p-1_35\*.idb
+	del vc71-stlport\libboost_regex-vc71-mt-p-1_35\*.exp
+	del vc71-stlport\libboost_regex-vc71-mt-p-1_35\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-p-1_34.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_34.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_34/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-p-1_35.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_35.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc71-mt-gdp-1_34.lib
+# section for boost_regex-vc71-mt-gdp-1_35.lib
 #
 ########################################################
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/c_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/cregex.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/cregex.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/fileiter.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/fileiter.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/icu.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/icu.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/instances.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/instances.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/posix_api.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/posix_api.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/regex.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/regex.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/regex_debug.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/static_mutex.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/static_mutex.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/usinstances.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/usinstances.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/wide_posix_api.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb ../src/winstances.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc71-mt-gdp-1_34_dir :
-	@if not exist "vc71-stlport\boost_regex-vc71-mt-gdp-1_34\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-gdp-1_34
+boost_regex-vc71-mt-gdp-1_35_dir :
+	@if not exist "vc71-stlport\boost_regex-vc71-mt-gdp-1_35\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-gdp-1_35
 
-boost_regex-vc71-mt-gdp-1_34_clean :
-	del vc71-stlport\boost_regex-vc71-mt-gdp-1_34\*.obj
-	del vc71-stlport\boost_regex-vc71-mt-gdp-1_34\*.idb
-	del vc71-stlport\boost_regex-vc71-mt-gdp-1_34\*.exp
-	del vc71-stlport\boost_regex-vc71-mt-gdp-1_34\*.pch
+boost_regex-vc71-mt-gdp-1_35_clean :
+	del vc71-stlport\boost_regex-vc71-mt-gdp-1_35\*.obj
+	del vc71-stlport\boost_regex-vc71-mt-gdp-1_35\*.idb
+	del vc71-stlport\boost_regex-vc71-mt-gdp-1_35\*.exp
+	del vc71-stlport\boost_regex-vc71-mt-gdp-1_35\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-gdp-1_34.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_34/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_34.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_34.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_34/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_34/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-gdp-1_35.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_35/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_35.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_35.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_35/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-sgdp-1_34.lib
+# section for libboost_regex-vc71-mt-sgdp-1_35.lib
 #
 ########################################################
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/c_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/cregex.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/cregex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/fileiter.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/fileiter.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/icu.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/icu.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/instances.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/instances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/regex.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/regex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/regex_debug.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/static_mutex.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/static_mutex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/usinstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/usinstances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/wide_posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.pdb ../src/winstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-sgdp-1_34_dir :
-	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34
+libboost_regex-vc71-mt-sgdp-1_35_dir :
+	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35
 
-libboost_regex-vc71-mt-sgdp-1_34_clean :
-	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34\*.obj
-	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34\*.idb
-	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34\*.exp
-	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_34\*.pch
+libboost_regex-vc71-mt-sgdp-1_35_clean :
+	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35\*.obj
+	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35\*.idb
+	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35\*.exp
+	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_35\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_34/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-gdp-1_34.lib
+# section for libboost_regex-vc71-mt-gdp-1_35.lib
 #
 ########################################################
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/c_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/cregex.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/cregex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/fileiter.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/fileiter.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/icu.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/icu.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/instances.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/instances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/regex.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/regex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/regex_debug.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/static_mutex.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/static_mutex.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/usinstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/usinstances.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/w32_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/wc_regex_traits.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/wide_posix_api.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_34.pdb ../src/winstances.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I"$(STLPORT_PATH)\stlport" /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-gdp-1_34_dir :
-	@if not exist "vc71-stlport\libboost_regex-vc71-mt-gdp-1_34\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-gdp-1_34
+libboost_regex-vc71-mt-gdp-1_35_dir :
+	@if not exist "vc71-stlport\libboost_regex-vc71-mt-gdp-1_35\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-gdp-1_35
 
-libboost_regex-vc71-mt-gdp-1_34_clean :
-	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_34\*.obj
-	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_34\*.idb
-	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_34\*.exp
-	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_34\*.pch
+libboost_regex-vc71-mt-gdp-1_35_clean :
+	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_35\*.obj
+	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_35\*.idb
+	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_35\*.exp
+	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_35\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-gdp-1_34.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_34.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_34/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-gdp-1_35.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_35.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_35/winstances.obj
 
diff --git a/build/vc71.mak b/build/vc71.mak
index 27fcf389..1956d4a3 100644
--- a/build/vc71.mak
+++ b/build/vc71.mak
@@ -60,27 +60,27 @@ ICU_LINK_OPTS= /LIBPATH:"$(ICU_PATH)\lib" icuin.lib icuuc.lib
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : main_dir libboost_regex-vc71-s-1_34_dir ./vc71/libboost_regex-vc71-s-1_34.lib libboost_regex-vc71-mt-s-1_34_dir ./vc71/libboost_regex-vc71-mt-s-1_34.lib libboost_regex-vc71-sgd-1_34_dir ./vc71/libboost_regex-vc71-sgd-1_34.lib libboost_regex-vc71-mt-sgd-1_34_dir ./vc71/libboost_regex-vc71-mt-sgd-1_34.lib boost_regex-vc71-mt-gd-1_34_dir ./vc71/boost_regex-vc71-mt-gd-1_34.lib boost_regex-vc71-mt-1_34_dir ./vc71/boost_regex-vc71-mt-1_34.lib libboost_regex-vc71-mt-1_34_dir ./vc71/libboost_regex-vc71-mt-1_34.lib libboost_regex-vc71-mt-gd-1_34_dir ./vc71/libboost_regex-vc71-mt-gd-1_34.lib
+all : main_dir libboost_regex-vc71-s-1_35_dir ./vc71/libboost_regex-vc71-s-1_35.lib libboost_regex-vc71-mt-s-1_35_dir ./vc71/libboost_regex-vc71-mt-s-1_35.lib libboost_regex-vc71-sgd-1_35_dir ./vc71/libboost_regex-vc71-sgd-1_35.lib libboost_regex-vc71-mt-sgd-1_35_dir ./vc71/libboost_regex-vc71-mt-sgd-1_35.lib boost_regex-vc71-mt-gd-1_35_dir ./vc71/boost_regex-vc71-mt-gd-1_35.lib boost_regex-vc71-mt-1_35_dir ./vc71/boost_regex-vc71-mt-1_35.lib libboost_regex-vc71-mt-1_35_dir ./vc71/libboost_regex-vc71-mt-1_35.lib libboost_regex-vc71-mt-gd-1_35_dir ./vc71/libboost_regex-vc71-mt-gd-1_35.lib
 
-clean :  libboost_regex-vc71-s-1_34_clean libboost_regex-vc71-mt-s-1_34_clean libboost_regex-vc71-sgd-1_34_clean libboost_regex-vc71-mt-sgd-1_34_clean boost_regex-vc71-mt-gd-1_34_clean boost_regex-vc71-mt-1_34_clean libboost_regex-vc71-mt-1_34_clean libboost_regex-vc71-mt-gd-1_34_clean
+clean :  libboost_regex-vc71-s-1_35_clean libboost_regex-vc71-mt-s-1_35_clean libboost_regex-vc71-sgd-1_35_clean libboost_regex-vc71-mt-sgd-1_35_clean boost_regex-vc71-mt-gd-1_35_clean boost_regex-vc71-mt-1_35_clean libboost_regex-vc71-mt-1_35_clean libboost_regex-vc71-mt-gd-1_35_clean
 
 install : all
-	copy vc71\libboost_regex-vc71-s-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\libboost_regex-vc71-mt-s-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\libboost_regex-vc71-sgd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\libboost_regex-vc71-sgd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc71\libboost_regex-vc71-mt-sgd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\libboost_regex-vc71-mt-sgd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc71\boost_regex-vc71-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\boost_regex-vc71-mt-gd-1_34.dll "$(MSVCDIR)\bin"
-	copy vc71\boost_regex-vc71-mt-gd-1_34.pdb "$(MSVCDIR)\lib"
-	copy vc71\boost_regex-vc71-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\boost_regex-vc71-mt-1_34.dll "$(MSVCDIR)\bin"
-	copy vc71\libboost_regex-vc71-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\libboost_regex-vc71-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc71\libboost_regex-vc71-mt-gd-1_34.pdb "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-s-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-mt-s-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-sgd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-sgd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-mt-sgd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-mt-sgd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc71\boost_regex-vc71-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\boost_regex-vc71-mt-gd-1_35.dll "$(MSVCDIR)\bin"
+	copy vc71\boost_regex-vc71-mt-gd-1_35.pdb "$(MSVCDIR)\lib"
+	copy vc71\boost_regex-vc71-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\boost_regex-vc71-mt-1_35.dll "$(MSVCDIR)\bin"
+	copy vc71\libboost_regex-vc71-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc71\libboost_regex-vc71-mt-gd-1_35.pdb "$(MSVCDIR)\lib"
 
 main_dir :
 	@if not exist "vc71\$(NULL)" mkdir vc71
@@ -88,545 +88,545 @@ main_dir :
 
 ########################################################
 #
-# section for libboost_regex-vc71-s-1_34.lib
+# section for libboost_regex-vc71-s-1_35.lib
 #
 ########################################################
-vc71/libboost_regex-vc71-s-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/c_regex_traits.cpp
+vc71/libboost_regex-vc71-s-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-s-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/libboost_regex-vc71-s-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/libboost_regex-vc71-s-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/cregex.cpp
+vc71/libboost_regex-vc71-s-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/cregex.cpp
 
-vc71/libboost_regex-vc71-s-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/fileiter.cpp
+vc71/libboost_regex-vc71-s-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/fileiter.cpp
 
-vc71/libboost_regex-vc71-s-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/icu.cpp
+vc71/libboost_regex-vc71-s-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/icu.cpp
 
-vc71/libboost_regex-vc71-s-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/instances.cpp
+vc71/libboost_regex-vc71-s-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/instances.cpp
 
-vc71/libboost_regex-vc71-s-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/posix_api.cpp
+vc71/libboost_regex-vc71-s-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/posix_api.cpp
 
-vc71/libboost_regex-vc71-s-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/regex.cpp
+vc71/libboost_regex-vc71-s-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/regex.cpp
 
-vc71/libboost_regex-vc71-s-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/regex_debug.cpp
+vc71/libboost_regex-vc71-s-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-s-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/libboost_regex-vc71-s-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/libboost_regex-vc71-s-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/libboost_regex-vc71-s-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/libboost_regex-vc71-s-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/static_mutex.cpp
+vc71/libboost_regex-vc71-s-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/static_mutex.cpp
 
-vc71/libboost_regex-vc71-s-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/usinstances.cpp
+vc71/libboost_regex-vc71-s-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/usinstances.cpp
 
-vc71/libboost_regex-vc71-s-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/libboost_regex-vc71-s-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/libboost_regex-vc71-s-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/libboost_regex-vc71-s-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/libboost_regex-vc71-s-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/wide_posix_api.cpp
+vc71/libboost_regex-vc71-s-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/libboost_regex-vc71-s-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_34/ -Fdvc71/libboost_regex-vc71-s-1_34.pdb ../src/winstances.cpp
+vc71/libboost_regex-vc71-s-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_35/ -Fdvc71/libboost_regex-vc71-s-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-s-1_34_dir :
-	@if not exist "vc71\libboost_regex-vc71-s-1_34\$(NULL)" mkdir vc71\libboost_regex-vc71-s-1_34
+libboost_regex-vc71-s-1_35_dir :
+	@if not exist "vc71\libboost_regex-vc71-s-1_35\$(NULL)" mkdir vc71\libboost_regex-vc71-s-1_35
 
-libboost_regex-vc71-s-1_34_clean :
-	del vc71\libboost_regex-vc71-s-1_34\*.obj
-	del vc71\libboost_regex-vc71-s-1_34\*.idb
-	del vc71\libboost_regex-vc71-s-1_34\*.exp
-	del vc71\libboost_regex-vc71-s-1_34\*.pch
+libboost_regex-vc71-s-1_35_clean :
+	del vc71\libboost_regex-vc71-s-1_35\*.obj
+	del vc71\libboost_regex-vc71-s-1_35\*.idb
+	del vc71\libboost_regex-vc71-s-1_35\*.exp
+	del vc71\libboost_regex-vc71-s-1_35\*.pch
 
-./vc71/libboost_regex-vc71-s-1_34.lib : vc71/libboost_regex-vc71-s-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/cregex.obj vc71/libboost_regex-vc71-s-1_34/fileiter.obj vc71/libboost_regex-vc71-s-1_34/icu.obj vc71/libboost_regex-vc71-s-1_34/instances.obj vc71/libboost_regex-vc71-s-1_34/posix_api.obj vc71/libboost_regex-vc71-s-1_34/regex.obj vc71/libboost_regex-vc71-s-1_34/regex_debug.obj vc71/libboost_regex-vc71-s-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_34/static_mutex.obj vc71/libboost_regex-vc71-s-1_34/usinstances.obj vc71/libboost_regex-vc71-s-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_34/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_34.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/cregex.obj vc71/libboost_regex-vc71-s-1_34/fileiter.obj vc71/libboost_regex-vc71-s-1_34/icu.obj vc71/libboost_regex-vc71-s-1_34/instances.obj vc71/libboost_regex-vc71-s-1_34/posix_api.obj vc71/libboost_regex-vc71-s-1_34/regex.obj vc71/libboost_regex-vc71-s-1_34/regex_debug.obj vc71/libboost_regex-vc71-s-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_34/static_mutex.obj vc71/libboost_regex-vc71-s-1_34/usinstances.obj vc71/libboost_regex-vc71-s-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_34/winstances.obj
+./vc71/libboost_regex-vc71-s-1_35.lib : vc71/libboost_regex-vc71-s-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/cregex.obj vc71/libboost_regex-vc71-s-1_35/fileiter.obj vc71/libboost_regex-vc71-s-1_35/icu.obj vc71/libboost_regex-vc71-s-1_35/instances.obj vc71/libboost_regex-vc71-s-1_35/posix_api.obj vc71/libboost_regex-vc71-s-1_35/regex.obj vc71/libboost_regex-vc71-s-1_35/regex_debug.obj vc71/libboost_regex-vc71-s-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_35/static_mutex.obj vc71/libboost_regex-vc71-s-1_35/usinstances.obj vc71/libboost_regex-vc71-s-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_35/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_35.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/cregex.obj vc71/libboost_regex-vc71-s-1_35/fileiter.obj vc71/libboost_regex-vc71-s-1_35/icu.obj vc71/libboost_regex-vc71-s-1_35/instances.obj vc71/libboost_regex-vc71-s-1_35/posix_api.obj vc71/libboost_regex-vc71-s-1_35/regex.obj vc71/libboost_regex-vc71-s-1_35/regex_debug.obj vc71/libboost_regex-vc71-s-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_35/static_mutex.obj vc71/libboost_regex-vc71-s-1_35/usinstances.obj vc71/libboost_regex-vc71-s-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-s-1_34.lib
+# section for libboost_regex-vc71-mt-s-1_35.lib
 #
 ########################################################
-vc71/libboost_regex-vc71-mt-s-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/c_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/cregex.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/cregex.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/fileiter.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/fileiter.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/icu.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/icu.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/instances.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/instances.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/posix_api.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/regex.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/regex.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/regex_debug.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/static_mutex.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/static_mutex.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/usinstances.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/usinstances.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/wide_posix_api.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_34/ -Fdvc71/libboost_regex-vc71-mt-s-1_34.pdb ../src/winstances.cpp
+vc71/libboost_regex-vc71-mt-s-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_35/ -Fdvc71/libboost_regex-vc71-mt-s-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-s-1_34_dir :
-	@if not exist "vc71\libboost_regex-vc71-mt-s-1_34\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-s-1_34
+libboost_regex-vc71-mt-s-1_35_dir :
+	@if not exist "vc71\libboost_regex-vc71-mt-s-1_35\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-s-1_35
 
-libboost_regex-vc71-mt-s-1_34_clean :
-	del vc71\libboost_regex-vc71-mt-s-1_34\*.obj
-	del vc71\libboost_regex-vc71-mt-s-1_34\*.idb
-	del vc71\libboost_regex-vc71-mt-s-1_34\*.exp
-	del vc71\libboost_regex-vc71-mt-s-1_34\*.pch
+libboost_regex-vc71-mt-s-1_35_clean :
+	del vc71\libboost_regex-vc71-mt-s-1_35\*.obj
+	del vc71\libboost_regex-vc71-mt-s-1_35\*.idb
+	del vc71\libboost_regex-vc71-mt-s-1_35\*.exp
+	del vc71\libboost_regex-vc71-mt-s-1_35\*.pch
 
-./vc71/libboost_regex-vc71-mt-s-1_34.lib : vc71/libboost_regex-vc71-mt-s-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/cregex.obj vc71/libboost_regex-vc71-mt-s-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_34/icu.obj vc71/libboost_regex-vc71-mt-s-1_34/instances.obj vc71/libboost_regex-vc71-mt-s-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_34/regex.obj vc71/libboost_regex-vc71-mt-s-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_34/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_34.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/cregex.obj vc71/libboost_regex-vc71-mt-s-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_34/icu.obj vc71/libboost_regex-vc71-mt-s-1_34/instances.obj vc71/libboost_regex-vc71-mt-s-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_34/regex.obj vc71/libboost_regex-vc71-mt-s-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_34/winstances.obj
+./vc71/libboost_regex-vc71-mt-s-1_35.lib : vc71/libboost_regex-vc71-mt-s-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/cregex.obj vc71/libboost_regex-vc71-mt-s-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_35/icu.obj vc71/libboost_regex-vc71-mt-s-1_35/instances.obj vc71/libboost_regex-vc71-mt-s-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_35/regex.obj vc71/libboost_regex-vc71-mt-s-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_35/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_35.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/cregex.obj vc71/libboost_regex-vc71-mt-s-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_35/icu.obj vc71/libboost_regex-vc71-mt-s-1_35/instances.obj vc71/libboost_regex-vc71-mt-s-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_35/regex.obj vc71/libboost_regex-vc71-mt-s-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-sgd-1_34.lib
+# section for libboost_regex-vc71-sgd-1_35.lib
 #
 ########################################################
-vc71/libboost_regex-vc71-sgd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/c_regex_traits.cpp
+vc71/libboost_regex-vc71-sgd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/libboost_regex-vc71-sgd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/cregex.cpp
+vc71/libboost_regex-vc71-sgd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/cregex.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/fileiter.cpp
+vc71/libboost_regex-vc71-sgd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/fileiter.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/icu.cpp
+vc71/libboost_regex-vc71-sgd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/icu.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/instances.cpp
+vc71/libboost_regex-vc71-sgd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/instances.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/posix_api.cpp
+vc71/libboost_regex-vc71-sgd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/posix_api.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/regex.cpp
+vc71/libboost_regex-vc71-sgd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/regex.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/regex_debug.cpp
+vc71/libboost_regex-vc71-sgd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/libboost_regex-vc71-sgd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/libboost_regex-vc71-sgd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/static_mutex.cpp
+vc71/libboost_regex-vc71-sgd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/static_mutex.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/usinstances.cpp
+vc71/libboost_regex-vc71-sgd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/usinstances.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/libboost_regex-vc71-sgd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/libboost_regex-vc71-sgd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/wide_posix_api.cpp
+vc71/libboost_regex-vc71-sgd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/libboost_regex-vc71-sgd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_34/ -Fdvc71/libboost_regex-vc71-sgd-1_34.pdb ../src/winstances.cpp
+vc71/libboost_regex-vc71-sgd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_35/ -Fdvc71/libboost_regex-vc71-sgd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-sgd-1_34_dir :
-	@if not exist "vc71\libboost_regex-vc71-sgd-1_34\$(NULL)" mkdir vc71\libboost_regex-vc71-sgd-1_34
+libboost_regex-vc71-sgd-1_35_dir :
+	@if not exist "vc71\libboost_regex-vc71-sgd-1_35\$(NULL)" mkdir vc71\libboost_regex-vc71-sgd-1_35
 
-libboost_regex-vc71-sgd-1_34_clean :
-	del vc71\libboost_regex-vc71-sgd-1_34\*.obj
-	del vc71\libboost_regex-vc71-sgd-1_34\*.idb
-	del vc71\libboost_regex-vc71-sgd-1_34\*.exp
-	del vc71\libboost_regex-vc71-sgd-1_34\*.pch
+libboost_regex-vc71-sgd-1_35_clean :
+	del vc71\libboost_regex-vc71-sgd-1_35\*.obj
+	del vc71\libboost_regex-vc71-sgd-1_35\*.idb
+	del vc71\libboost_regex-vc71-sgd-1_35\*.exp
+	del vc71\libboost_regex-vc71-sgd-1_35\*.pch
 
-./vc71/libboost_regex-vc71-sgd-1_34.lib : vc71/libboost_regex-vc71-sgd-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/cregex.obj vc71/libboost_regex-vc71-sgd-1_34/fileiter.obj vc71/libboost_regex-vc71-sgd-1_34/icu.obj vc71/libboost_regex-vc71-sgd-1_34/instances.obj vc71/libboost_regex-vc71-sgd-1_34/posix_api.obj vc71/libboost_regex-vc71-sgd-1_34/regex.obj vc71/libboost_regex-vc71-sgd-1_34/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_34/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_34/usinstances.obj vc71/libboost_regex-vc71-sgd-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_34/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_34.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/cregex.obj vc71/libboost_regex-vc71-sgd-1_34/fileiter.obj vc71/libboost_regex-vc71-sgd-1_34/icu.obj vc71/libboost_regex-vc71-sgd-1_34/instances.obj vc71/libboost_regex-vc71-sgd-1_34/posix_api.obj vc71/libboost_regex-vc71-sgd-1_34/regex.obj vc71/libboost_regex-vc71-sgd-1_34/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_34/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_34/usinstances.obj vc71/libboost_regex-vc71-sgd-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_34/winstances.obj
+./vc71/libboost_regex-vc71-sgd-1_35.lib : vc71/libboost_regex-vc71-sgd-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/cregex.obj vc71/libboost_regex-vc71-sgd-1_35/fileiter.obj vc71/libboost_regex-vc71-sgd-1_35/icu.obj vc71/libboost_regex-vc71-sgd-1_35/instances.obj vc71/libboost_regex-vc71-sgd-1_35/posix_api.obj vc71/libboost_regex-vc71-sgd-1_35/regex.obj vc71/libboost_regex-vc71-sgd-1_35/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_35/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_35/usinstances.obj vc71/libboost_regex-vc71-sgd-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_35/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_35.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/cregex.obj vc71/libboost_regex-vc71-sgd-1_35/fileiter.obj vc71/libboost_regex-vc71-sgd-1_35/icu.obj vc71/libboost_regex-vc71-sgd-1_35/instances.obj vc71/libboost_regex-vc71-sgd-1_35/posix_api.obj vc71/libboost_regex-vc71-sgd-1_35/regex.obj vc71/libboost_regex-vc71-sgd-1_35/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_35/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_35/usinstances.obj vc71/libboost_regex-vc71-sgd-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-sgd-1_34.lib
+# section for libboost_regex-vc71-mt-sgd-1_35.lib
 #
 ########################################################
-vc71/libboost_regex-vc71-mt-sgd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/c_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/cregex.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/cregex.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/fileiter.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/fileiter.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/icu.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/icu.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/instances.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/instances.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/posix_api.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/regex.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/regex.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/regex_debug.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/static_mutex.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/static_mutex.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/usinstances.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/usinstances.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/wide_posix_api.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_34/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_34.pdb ../src/winstances.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_35/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-sgd-1_34_dir :
-	@if not exist "vc71\libboost_regex-vc71-mt-sgd-1_34\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-sgd-1_34
+libboost_regex-vc71-mt-sgd-1_35_dir :
+	@if not exist "vc71\libboost_regex-vc71-mt-sgd-1_35\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-sgd-1_35
 
-libboost_regex-vc71-mt-sgd-1_34_clean :
-	del vc71\libboost_regex-vc71-mt-sgd-1_34\*.obj
-	del vc71\libboost_regex-vc71-mt-sgd-1_34\*.idb
-	del vc71\libboost_regex-vc71-mt-sgd-1_34\*.exp
-	del vc71\libboost_regex-vc71-mt-sgd-1_34\*.pch
+libboost_regex-vc71-mt-sgd-1_35_clean :
+	del vc71\libboost_regex-vc71-mt-sgd-1_35\*.obj
+	del vc71\libboost_regex-vc71-mt-sgd-1_35\*.idb
+	del vc71\libboost_regex-vc71-mt-sgd-1_35\*.exp
+	del vc71\libboost_regex-vc71-mt-sgd-1_35\*.pch
 
-./vc71/libboost_regex-vc71-mt-sgd-1_34.lib : vc71/libboost_regex-vc71-mt-sgd-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_34/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_34/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_34/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_34.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_34/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_34/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_34/winstances.obj
+./vc71/libboost_regex-vc71-mt-sgd-1_35.lib : vc71/libboost_regex-vc71-mt-sgd-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_35/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_35/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_35/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_35.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_35/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_35/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc71-mt-gd-1_34.lib
+# section for boost_regex-vc71-mt-gd-1_35.lib
 #
 ########################################################
-vc71/boost_regex-vc71-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/cregex.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/icu.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/instances.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/regex.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_34/ -Fdvc71/boost_regex-vc71-mt-gd-1_34.pdb ../src/winstances.cpp
+vc71/boost_regex-vc71-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_35/ -Fdvc71/boost_regex-vc71-mt-gd-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc71-mt-gd-1_34_dir :
-	@if not exist "vc71\boost_regex-vc71-mt-gd-1_34\$(NULL)" mkdir vc71\boost_regex-vc71-mt-gd-1_34
+boost_regex-vc71-mt-gd-1_35_dir :
+	@if not exist "vc71\boost_regex-vc71-mt-gd-1_35\$(NULL)" mkdir vc71\boost_regex-vc71-mt-gd-1_35
 
-boost_regex-vc71-mt-gd-1_34_clean :
-	del vc71\boost_regex-vc71-mt-gd-1_34\*.obj
-	del vc71\boost_regex-vc71-mt-gd-1_34\*.idb
-	del vc71\boost_regex-vc71-mt-gd-1_34\*.exp
-	del vc71\boost_regex-vc71-mt-gd-1_34\*.pch
+boost_regex-vc71-mt-gd-1_35_clean :
+	del vc71\boost_regex-vc71-mt-gd-1_35\*.obj
+	del vc71\boost_regex-vc71-mt-gd-1_35\*.idb
+	del vc71\boost_regex-vc71-mt-gd-1_35\*.exp
+	del vc71\boost_regex-vc71-mt-gd-1_35\*.pch
 
-./vc71/boost_regex-vc71-mt-gd-1_34.lib : vc71/boost_regex-vc71-mt-gd-1_34/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/cregex.obj vc71/boost_regex-vc71-mt-gd-1_34/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_34/icu.obj vc71/boost_regex-vc71-mt-gd-1_34/instances.obj vc71/boost_regex-vc71-mt-gd-1_34/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_34/regex.obj vc71/boost_regex-vc71-mt-gd-1_34/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_34/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_34/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_34/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_34/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_34/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_34.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_34.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-gd-1_34/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/cregex.obj vc71/boost_regex-vc71-mt-gd-1_34/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_34/icu.obj vc71/boost_regex-vc71-mt-gd-1_34/instances.obj vc71/boost_regex-vc71-mt-gd-1_34/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_34/regex.obj vc71/boost_regex-vc71-mt-gd-1_34/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_34/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_34/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_34/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_34/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_34/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_34/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_34/winstances.obj
+./vc71/boost_regex-vc71-mt-gd-1_35.lib : vc71/boost_regex-vc71-mt-gd-1_35/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/cregex.obj vc71/boost_regex-vc71-mt-gd-1_35/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_35/icu.obj vc71/boost_regex-vc71-mt-gd-1_35/instances.obj vc71/boost_regex-vc71-mt-gd-1_35/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_35/regex.obj vc71/boost_regex-vc71-mt-gd-1_35/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_35/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_35/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_35/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_35/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_35/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_35.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_35.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-gd-1_35/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/cregex.obj vc71/boost_regex-vc71-mt-gd-1_35/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_35/icu.obj vc71/boost_regex-vc71-mt-gd-1_35/instances.obj vc71/boost_regex-vc71-mt-gd-1_35/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_35/regex.obj vc71/boost_regex-vc71-mt-gd-1_35/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_35/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_35/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_35/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_35/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_35/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_35/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc71-mt-1_34.lib
+# section for boost_regex-vc71-mt-1_35.lib
 #
 ########################################################
-vc71/boost_regex-vc71-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc71/boost_regex-vc71-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/boost_regex-vc71-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/cregex.cpp
+vc71/boost_regex-vc71-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/cregex.cpp
 
-vc71/boost_regex-vc71-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/fileiter.cpp
+vc71/boost_regex-vc71-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/fileiter.cpp
 
-vc71/boost_regex-vc71-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/icu.cpp
+vc71/boost_regex-vc71-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/icu.cpp
 
-vc71/boost_regex-vc71-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/instances.cpp
+vc71/boost_regex-vc71-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/instances.cpp
 
-vc71/boost_regex-vc71-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/posix_api.cpp
+vc71/boost_regex-vc71-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/posix_api.cpp
 
-vc71/boost_regex-vc71-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/regex.cpp
+vc71/boost_regex-vc71-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/regex.cpp
 
-vc71/boost_regex-vc71-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/regex_debug.cpp
+vc71/boost_regex-vc71-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/boost_regex-vc71-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/boost_regex-vc71-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/boost_regex-vc71-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/boost_regex-vc71-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/static_mutex.cpp
+vc71/boost_regex-vc71-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc71/boost_regex-vc71-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/usinstances.cpp
+vc71/boost_regex-vc71-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/usinstances.cpp
 
-vc71/boost_regex-vc71-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/boost_regex-vc71-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/boost_regex-vc71-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc71/boost_regex-vc71-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/boost_regex-vc71-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_34/ -Fdvc71/boost_regex-vc71-mt-1_34.pdb ../src/winstances.cpp
+vc71/boost_regex-vc71-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_35/ -Fdvc71/boost_regex-vc71-mt-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc71-mt-1_34_dir :
-	@if not exist "vc71\boost_regex-vc71-mt-1_34\$(NULL)" mkdir vc71\boost_regex-vc71-mt-1_34
+boost_regex-vc71-mt-1_35_dir :
+	@if not exist "vc71\boost_regex-vc71-mt-1_35\$(NULL)" mkdir vc71\boost_regex-vc71-mt-1_35
 
-boost_regex-vc71-mt-1_34_clean :
-	del vc71\boost_regex-vc71-mt-1_34\*.obj
-	del vc71\boost_regex-vc71-mt-1_34\*.idb
-	del vc71\boost_regex-vc71-mt-1_34\*.exp
-	del vc71\boost_regex-vc71-mt-1_34\*.pch
+boost_regex-vc71-mt-1_35_clean :
+	del vc71\boost_regex-vc71-mt-1_35\*.obj
+	del vc71\boost_regex-vc71-mt-1_35\*.idb
+	del vc71\boost_regex-vc71-mt-1_35\*.exp
+	del vc71\boost_regex-vc71-mt-1_35\*.pch
 
-./vc71/boost_regex-vc71-mt-1_34.lib : vc71/boost_regex-vc71-mt-1_34/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/cregex.obj vc71/boost_regex-vc71-mt-1_34/fileiter.obj vc71/boost_regex-vc71-mt-1_34/icu.obj vc71/boost_regex-vc71-mt-1_34/instances.obj vc71/boost_regex-vc71-mt-1_34/posix_api.obj vc71/boost_regex-vc71-mt-1_34/regex.obj vc71/boost_regex-vc71-mt-1_34/regex_debug.obj vc71/boost_regex-vc71-mt-1_34/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_34/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_34/static_mutex.obj vc71/boost_regex-vc71-mt-1_34/usinstances.obj vc71/boost_regex-vc71-mt-1_34/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_34.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_34.dll" /implib:"vc71/boost_regex-vc71-mt-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-1_34/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/cregex.obj vc71/boost_regex-vc71-mt-1_34/fileiter.obj vc71/boost_regex-vc71-mt-1_34/icu.obj vc71/boost_regex-vc71-mt-1_34/instances.obj vc71/boost_regex-vc71-mt-1_34/posix_api.obj vc71/boost_regex-vc71-mt-1_34/regex.obj vc71/boost_regex-vc71-mt-1_34/regex_debug.obj vc71/boost_regex-vc71-mt-1_34/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_34/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_34/static_mutex.obj vc71/boost_regex-vc71-mt-1_34/usinstances.obj vc71/boost_regex-vc71-mt-1_34/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_34/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_34/winstances.obj
+./vc71/boost_regex-vc71-mt-1_35.lib : vc71/boost_regex-vc71-mt-1_35/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/cregex.obj vc71/boost_regex-vc71-mt-1_35/fileiter.obj vc71/boost_regex-vc71-mt-1_35/icu.obj vc71/boost_regex-vc71-mt-1_35/instances.obj vc71/boost_regex-vc71-mt-1_35/posix_api.obj vc71/boost_regex-vc71-mt-1_35/regex.obj vc71/boost_regex-vc71-mt-1_35/regex_debug.obj vc71/boost_regex-vc71-mt-1_35/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_35/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_35/static_mutex.obj vc71/boost_regex-vc71-mt-1_35/usinstances.obj vc71/boost_regex-vc71-mt-1_35/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_35.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_35.dll" /implib:"vc71/boost_regex-vc71-mt-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-1_35/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/cregex.obj vc71/boost_regex-vc71-mt-1_35/fileiter.obj vc71/boost_regex-vc71-mt-1_35/icu.obj vc71/boost_regex-vc71-mt-1_35/instances.obj vc71/boost_regex-vc71-mt-1_35/posix_api.obj vc71/boost_regex-vc71-mt-1_35/regex.obj vc71/boost_regex-vc71-mt-1_35/regex_debug.obj vc71/boost_regex-vc71-mt-1_35/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_35/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_35/static_mutex.obj vc71/boost_regex-vc71-mt-1_35/usinstances.obj vc71/boost_regex-vc71-mt-1_35/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_35/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-1_34.lib
+# section for libboost_regex-vc71-mt-1_35.lib
 #
 ########################################################
-vc71/libboost_regex-vc71-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/cregex.cpp
+vc71/libboost_regex-vc71-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/cregex.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/fileiter.cpp
+vc71/libboost_regex-vc71-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/fileiter.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/icu.cpp
+vc71/libboost_regex-vc71-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/icu.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/instances.cpp
+vc71/libboost_regex-vc71-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/instances.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/posix_api.cpp
+vc71/libboost_regex-vc71-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/regex.cpp
+vc71/libboost_regex-vc71-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/regex.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/regex_debug.cpp
+vc71/libboost_regex-vc71-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/libboost_regex-vc71-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/libboost_regex-vc71-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/static_mutex.cpp
+vc71/libboost_regex-vc71-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/usinstances.cpp
+vc71/libboost_regex-vc71-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/usinstances.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc71/libboost_regex-vc71-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_34/ -Fdvc71/libboost_regex-vc71-mt-1_34.pdb ../src/winstances.cpp
+vc71/libboost_regex-vc71-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_35/ -Fdvc71/libboost_regex-vc71-mt-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-1_34_dir :
-	@if not exist "vc71\libboost_regex-vc71-mt-1_34\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-1_34
+libboost_regex-vc71-mt-1_35_dir :
+	@if not exist "vc71\libboost_regex-vc71-mt-1_35\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-1_35
 
-libboost_regex-vc71-mt-1_34_clean :
-	del vc71\libboost_regex-vc71-mt-1_34\*.obj
-	del vc71\libboost_regex-vc71-mt-1_34\*.idb
-	del vc71\libboost_regex-vc71-mt-1_34\*.exp
-	del vc71\libboost_regex-vc71-mt-1_34\*.pch
+libboost_regex-vc71-mt-1_35_clean :
+	del vc71\libboost_regex-vc71-mt-1_35\*.obj
+	del vc71\libboost_regex-vc71-mt-1_35\*.idb
+	del vc71\libboost_regex-vc71-mt-1_35\*.exp
+	del vc71\libboost_regex-vc71-mt-1_35\*.pch
 
-./vc71/libboost_regex-vc71-mt-1_34.lib : vc71/libboost_regex-vc71-mt-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/cregex.obj vc71/libboost_regex-vc71-mt-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-1_34/icu.obj vc71/libboost_regex-vc71-mt-1_34/instances.obj vc71/libboost_regex-vc71-mt-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-1_34/regex.obj vc71/libboost_regex-vc71-mt-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_34/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_34.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/cregex.obj vc71/libboost_regex-vc71-mt-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-1_34/icu.obj vc71/libboost_regex-vc71-mt-1_34/instances.obj vc71/libboost_regex-vc71-mt-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-1_34/regex.obj vc71/libboost_regex-vc71-mt-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_34/winstances.obj
+./vc71/libboost_regex-vc71-mt-1_35.lib : vc71/libboost_regex-vc71-mt-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/cregex.obj vc71/libboost_regex-vc71-mt-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-1_35/icu.obj vc71/libboost_regex-vc71-mt-1_35/instances.obj vc71/libboost_regex-vc71-mt-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-1_35/regex.obj vc71/libboost_regex-vc71-mt-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_35/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_35.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/cregex.obj vc71/libboost_regex-vc71-mt-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-1_35/icu.obj vc71/libboost_regex-vc71-mt-1_35/instances.obj vc71/libboost_regex-vc71-mt-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-1_35/regex.obj vc71/libboost_regex-vc71-mt-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc71-mt-gd-1_34.lib
+# section for libboost_regex-vc71-mt-gd-1_35.lib
 #
 ########################################################
-vc71/libboost_regex-vc71-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/cregex.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/icu.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/instances.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/regex.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_34/ -Fdvc71/libboost_regex-vc71-mt-gd-1_34.pdb ../src/winstances.cpp
+vc71/libboost_regex-vc71-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_35/ -Fdvc71/libboost_regex-vc71-mt-gd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc71-mt-gd-1_34_dir :
-	@if not exist "vc71\libboost_regex-vc71-mt-gd-1_34\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-gd-1_34
+libboost_regex-vc71-mt-gd-1_35_dir :
+	@if not exist "vc71\libboost_regex-vc71-mt-gd-1_35\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-gd-1_35
 
-libboost_regex-vc71-mt-gd-1_34_clean :
-	del vc71\libboost_regex-vc71-mt-gd-1_34\*.obj
-	del vc71\libboost_regex-vc71-mt-gd-1_34\*.idb
-	del vc71\libboost_regex-vc71-mt-gd-1_34\*.exp
-	del vc71\libboost_regex-vc71-mt-gd-1_34\*.pch
+libboost_regex-vc71-mt-gd-1_35_clean :
+	del vc71\libboost_regex-vc71-mt-gd-1_35\*.obj
+	del vc71\libboost_regex-vc71-mt-gd-1_35\*.idb
+	del vc71\libboost_regex-vc71-mt-gd-1_35\*.exp
+	del vc71\libboost_regex-vc71-mt-gd-1_35\*.pch
 
-./vc71/libboost_regex-vc71-mt-gd-1_34.lib : vc71/libboost_regex-vc71-mt-gd-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_34/icu.obj vc71/libboost_regex-vc71-mt-gd-1_34/instances.obj vc71/libboost_regex-vc71-mt-gd-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_34/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_34.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_34/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_34/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_34/icu.obj vc71/libboost_regex-vc71-mt-gd-1_34/instances.obj vc71/libboost_regex-vc71-mt-gd-1_34/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_34/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_34/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_34/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_34/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_34/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_34/winstances.obj
+./vc71/libboost_regex-vc71-mt-gd-1_35.lib : vc71/libboost_regex-vc71-mt-gd-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_35/icu.obj vc71/libboost_regex-vc71-mt-gd-1_35/instances.obj vc71/libboost_regex-vc71-mt-gd-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_35/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_35.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_35/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_35/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_35/icu.obj vc71/libboost_regex-vc71-mt-gd-1_35/instances.obj vc71/libboost_regex-vc71-mt-gd-1_35/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_35/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_35/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_35/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_35/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_35/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_35/winstances.obj
 
diff --git a/build/vc8.mak b/build/vc8.mak
index dbaf664b..e14e2073 100644
--- a/build/vc8.mak
+++ b/build/vc8.mak
@@ -60,22 +60,22 @@ ICU_LINK_OPTS= /LIBPATH:"$(ICU_PATH)\lib" icuin.lib icuuc.lib
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/icu.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/u32regex_iterator.hpp ../../../boost/regex/v4/u32regex_token_iterator.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cwchar.hpp
 
-all : main_dir libboost_regex-vc80-mt-s-1_34_dir ./vc80/libboost_regex-vc80-mt-s-1_34.lib libboost_regex-vc80-mt-sgd-1_34_dir ./vc80/libboost_regex-vc80-mt-sgd-1_34.lib boost_regex-vc80-mt-gd-1_34_dir ./vc80/boost_regex-vc80-mt-gd-1_34.lib boost_regex-vc80-mt-1_34_dir ./vc80/boost_regex-vc80-mt-1_34.lib libboost_regex-vc80-mt-1_34_dir ./vc80/libboost_regex-vc80-mt-1_34.lib libboost_regex-vc80-mt-gd-1_34_dir ./vc80/libboost_regex-vc80-mt-gd-1_34.lib
+all : main_dir libboost_regex-vc80-mt-s-1_35_dir ./vc80/libboost_regex-vc80-mt-s-1_35.lib libboost_regex-vc80-mt-sgd-1_35_dir ./vc80/libboost_regex-vc80-mt-sgd-1_35.lib boost_regex-vc80-mt-gd-1_35_dir ./vc80/boost_regex-vc80-mt-gd-1_35.lib boost_regex-vc80-mt-1_35_dir ./vc80/boost_regex-vc80-mt-1_35.lib libboost_regex-vc80-mt-1_35_dir ./vc80/libboost_regex-vc80-mt-1_35.lib libboost_regex-vc80-mt-gd-1_35_dir ./vc80/libboost_regex-vc80-mt-gd-1_35.lib
 
-clean :  libboost_regex-vc80-mt-s-1_34_clean libboost_regex-vc80-mt-sgd-1_34_clean boost_regex-vc80-mt-gd-1_34_clean boost_regex-vc80-mt-1_34_clean libboost_regex-vc80-mt-1_34_clean libboost_regex-vc80-mt-gd-1_34_clean
+clean :  libboost_regex-vc80-mt-s-1_35_clean libboost_regex-vc80-mt-sgd-1_35_clean boost_regex-vc80-mt-gd-1_35_clean boost_regex-vc80-mt-1_35_clean libboost_regex-vc80-mt-1_35_clean libboost_regex-vc80-mt-gd-1_35_clean
 
 install : all
-	copy vc80\libboost_regex-vc80-mt-s-1_34.lib "$(MSVCDIR)\lib"
-	copy vc80\libboost_regex-vc80-mt-sgd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc80\boost_regex-vc80-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc80\boost_regex-vc80-mt-gd-1_34.dll "$(MSVCDIR)\bin"
-	copy vc80\boost_regex-vc80-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc80\boost_regex-vc80-mt-1_34.dll "$(MSVCDIR)\bin"
-	copy vc80\libboost_regex-vc80-mt-1_34.lib "$(MSVCDIR)\lib"
-	copy vc80\libboost_regex-vc80-mt-gd-1_34.lib "$(MSVCDIR)\lib"
-	copy vc80\libboost_regex-vc80-mt-gd-1_34.pdb "$(MSVCDIR)\lib"
+	copy vc80\libboost_regex-vc80-mt-s-1_35.lib "$(MSVCDIR)\lib"
+	copy vc80\libboost_regex-vc80-mt-sgd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc80\boost_regex-vc80-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc80\boost_regex-vc80-mt-gd-1_35.dll "$(MSVCDIR)\bin"
+	copy vc80\boost_regex-vc80-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc80\boost_regex-vc80-mt-1_35.dll "$(MSVCDIR)\bin"
+	copy vc80\libboost_regex-vc80-mt-1_35.lib "$(MSVCDIR)\lib"
+	copy vc80\libboost_regex-vc80-mt-gd-1_35.lib "$(MSVCDIR)\lib"
+	copy vc80\libboost_regex-vc80-mt-gd-1_35.pdb "$(MSVCDIR)\lib"
 
 main_dir :
 	@if not exist "vc80\$(NULL)" mkdir vc80
@@ -83,409 +83,409 @@ main_dir :
 
 ########################################################
 #
-# section for libboost_regex-vc80-mt-s-1_34.lib
+# section for libboost_regex-vc80-mt-s-1_35.lib
 #
 ########################################################
-vc80/libboost_regex-vc80-mt-s-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/c_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/c_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/cpp_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/cregex.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/cregex.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/fileiter.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/fileiter.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/icu.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/icu.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/instances.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/instances.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/posix_api.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/regex.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/regex.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/regex_debug.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/regex_debug.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/regex_raw_buffer.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/regex_traits_defaults.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/static_mutex.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/static_mutex.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/usinstances.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/usinstances.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/w32_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/wc_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/wide_posix_api.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/wide_posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-s-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_34/ -Fdvc80/libboost_regex-vc80-mt-s-1_34.pdb ../src/winstances.cpp
+vc80/libboost_regex-vc80-mt-s-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /EHsc /O2  /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-s-1_35/ -Fdvc80/libboost_regex-vc80-mt-s-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc80-mt-s-1_34_dir :
-	@if not exist "vc80\libboost_regex-vc80-mt-s-1_34\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-s-1_34
+libboost_regex-vc80-mt-s-1_35_dir :
+	@if not exist "vc80\libboost_regex-vc80-mt-s-1_35\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-s-1_35
 
-libboost_regex-vc80-mt-s-1_34_clean :
-	del vc80\libboost_regex-vc80-mt-s-1_34\*.obj
-	del vc80\libboost_regex-vc80-mt-s-1_34\*.idb
-	del vc80\libboost_regex-vc80-mt-s-1_34\*.exp
-	del vc80\libboost_regex-vc80-mt-s-1_34\*.pch
+libboost_regex-vc80-mt-s-1_35_clean :
+	del vc80\libboost_regex-vc80-mt-s-1_35\*.obj
+	del vc80\libboost_regex-vc80-mt-s-1_35\*.idb
+	del vc80\libboost_regex-vc80-mt-s-1_35\*.exp
+	del vc80\libboost_regex-vc80-mt-s-1_35\*.pch
 
-./vc80/libboost_regex-vc80-mt-s-1_34.lib : vc80/libboost_regex-vc80-mt-s-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/cregex.obj vc80/libboost_regex-vc80-mt-s-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-s-1_34/icu.obj vc80/libboost_regex-vc80-mt-s-1_34/instances.obj vc80/libboost_regex-vc80-mt-s-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-s-1_34/regex.obj vc80/libboost_regex-vc80-mt-s-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-s-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-s-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-s-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-s-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-s-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-s-1_34/winstances.obj
-	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-s-1_34.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-s-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/cregex.obj vc80/libboost_regex-vc80-mt-s-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-s-1_34/icu.obj vc80/libboost_regex-vc80-mt-s-1_34/instances.obj vc80/libboost_regex-vc80-mt-s-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-s-1_34/regex.obj vc80/libboost_regex-vc80-mt-s-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-s-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-s-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-s-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-s-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-s-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-s-1_34/winstances.obj
+./vc80/libboost_regex-vc80-mt-s-1_35.lib : vc80/libboost_regex-vc80-mt-s-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/cregex.obj vc80/libboost_regex-vc80-mt-s-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-s-1_35/icu.obj vc80/libboost_regex-vc80-mt-s-1_35/instances.obj vc80/libboost_regex-vc80-mt-s-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-s-1_35/regex.obj vc80/libboost_regex-vc80-mt-s-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-s-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-s-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-s-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-s-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-s-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-s-1_35/winstances.obj
+	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-s-1_35.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-s-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/cregex.obj vc80/libboost_regex-vc80-mt-s-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-s-1_35/icu.obj vc80/libboost_regex-vc80-mt-s-1_35/instances.obj vc80/libboost_regex-vc80-mt-s-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-s-1_35/regex.obj vc80/libboost_regex-vc80-mt-s-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-s-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-s-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-s-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-s-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-s-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-s-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-s-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc80-mt-sgd-1_34.lib
+# section for libboost_regex-vc80-mt-sgd-1_35.lib
 #
 ########################################################
-vc80/libboost_regex-vc80-mt-sgd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/c_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/cregex.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/cregex.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/fileiter.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/fileiter.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/icu.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/icu.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/instances.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/instances.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/posix_api.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/regex.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/regex.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/regex_debug.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/regex_debug.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/static_mutex.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/static_mutex.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/usinstances.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/usinstances.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/w32_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/wc_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/wide_posix_api.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-sgd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_34/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_34.pdb ../src/winstances.cpp
+vc80/libboost_regex-vc80-mt-sgd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /EHsc /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-sgd-1_35/ -Fdvc80/libboost_regex-vc80-mt-sgd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc80-mt-sgd-1_34_dir :
-	@if not exist "vc80\libboost_regex-vc80-mt-sgd-1_34\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-sgd-1_34
+libboost_regex-vc80-mt-sgd-1_35_dir :
+	@if not exist "vc80\libboost_regex-vc80-mt-sgd-1_35\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-sgd-1_35
 
-libboost_regex-vc80-mt-sgd-1_34_clean :
-	del vc80\libboost_regex-vc80-mt-sgd-1_34\*.obj
-	del vc80\libboost_regex-vc80-mt-sgd-1_34\*.idb
-	del vc80\libboost_regex-vc80-mt-sgd-1_34\*.exp
-	del vc80\libboost_regex-vc80-mt-sgd-1_34\*.pch
+libboost_regex-vc80-mt-sgd-1_35_clean :
+	del vc80\libboost_regex-vc80-mt-sgd-1_35\*.obj
+	del vc80\libboost_regex-vc80-mt-sgd-1_35\*.idb
+	del vc80\libboost_regex-vc80-mt-sgd-1_35\*.exp
+	del vc80\libboost_regex-vc80-mt-sgd-1_35\*.pch
 
-./vc80/libboost_regex-vc80-mt-sgd-1_34.lib : vc80/libboost_regex-vc80-mt-sgd-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/cregex.obj vc80/libboost_regex-vc80-mt-sgd-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-sgd-1_34/icu.obj vc80/libboost_regex-vc80-mt-sgd-1_34/instances.obj vc80/libboost_regex-vc80-mt-sgd-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-sgd-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-sgd-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-sgd-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_34/winstances.obj
-	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-sgd-1_34.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-sgd-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/cregex.obj vc80/libboost_regex-vc80-mt-sgd-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-sgd-1_34/icu.obj vc80/libboost_regex-vc80-mt-sgd-1_34/instances.obj vc80/libboost_regex-vc80-mt-sgd-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-sgd-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-sgd-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-sgd-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-sgd-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_34/winstances.obj
+./vc80/libboost_regex-vc80-mt-sgd-1_35.lib : vc80/libboost_regex-vc80-mt-sgd-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/cregex.obj vc80/libboost_regex-vc80-mt-sgd-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-sgd-1_35/icu.obj vc80/libboost_regex-vc80-mt-sgd-1_35/instances.obj vc80/libboost_regex-vc80-mt-sgd-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-sgd-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-sgd-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-sgd-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_35/winstances.obj
+	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-sgd-1_35.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-sgd-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/cregex.obj vc80/libboost_regex-vc80-mt-sgd-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-sgd-1_35/icu.obj vc80/libboost_regex-vc80-mt-sgd-1_35/instances.obj vc80/libboost_regex-vc80-mt-sgd-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-sgd-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-sgd-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-sgd-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-sgd-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-sgd-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-sgd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc80-mt-gd-1_34.lib
+# section for boost_regex-vc80-mt-gd-1_35.lib
 #
 ########################################################
-vc80/boost_regex-vc80-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/cregex.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/icu.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/instances.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/regex.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc80/boost_regex-vc80-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_34/ -Fdvc80/boost_regex-vc80-mt-gd-1_34.pdb ../src/winstances.cpp
+vc80/boost_regex-vc80-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-gd-1_35/ -Fdvc80/boost_regex-vc80-mt-gd-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc80-mt-gd-1_34_dir :
-	@if not exist "vc80\boost_regex-vc80-mt-gd-1_34\$(NULL)" mkdir vc80\boost_regex-vc80-mt-gd-1_34
+boost_regex-vc80-mt-gd-1_35_dir :
+	@if not exist "vc80\boost_regex-vc80-mt-gd-1_35\$(NULL)" mkdir vc80\boost_regex-vc80-mt-gd-1_35
 
-boost_regex-vc80-mt-gd-1_34_clean :
-	del vc80\boost_regex-vc80-mt-gd-1_34\*.obj
-	del vc80\boost_regex-vc80-mt-gd-1_34\*.idb
-	del vc80\boost_regex-vc80-mt-gd-1_34\*.exp
-	del vc80\boost_regex-vc80-mt-gd-1_34\*.pch
+boost_regex-vc80-mt-gd-1_35_clean :
+	del vc80\boost_regex-vc80-mt-gd-1_35\*.obj
+	del vc80\boost_regex-vc80-mt-gd-1_35\*.idb
+	del vc80\boost_regex-vc80-mt-gd-1_35\*.exp
+	del vc80\boost_regex-vc80-mt-gd-1_35\*.pch
 
-./vc80/boost_regex-vc80-mt-gd-1_34.lib : vc80/boost_regex-vc80-mt-gd-1_34/c_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/cregex.obj vc80/boost_regex-vc80-mt-gd-1_34/fileiter.obj vc80/boost_regex-vc80-mt-gd-1_34/icu.obj vc80/boost_regex-vc80-mt-gd-1_34/instances.obj vc80/boost_regex-vc80-mt-gd-1_34/posix_api.obj vc80/boost_regex-vc80-mt-gd-1_34/regex.obj vc80/boost_regex-vc80-mt-gd-1_34/regex_debug.obj vc80/boost_regex-vc80-mt-gd-1_34/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-gd-1_34/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-gd-1_34/static_mutex.obj vc80/boost_regex-vc80-mt-gd-1_34/usinstances.obj vc80/boost_regex-vc80-mt-gd-1_34/w32_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/wc_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/wide_posix_api.obj vc80/boost_regex-vc80-mt-gd-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc80/boost_regex-vc80-mt-gd-1_34.pdb" /debug /machine:I386 /out:"vc80/boost_regex-vc80-mt-gd-1_34.dll" /implib:"vc80/boost_regex-vc80-mt-gd-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc80/boost_regex-vc80-mt-gd-1_34/c_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/cregex.obj vc80/boost_regex-vc80-mt-gd-1_34/fileiter.obj vc80/boost_regex-vc80-mt-gd-1_34/icu.obj vc80/boost_regex-vc80-mt-gd-1_34/instances.obj vc80/boost_regex-vc80-mt-gd-1_34/posix_api.obj vc80/boost_regex-vc80-mt-gd-1_34/regex.obj vc80/boost_regex-vc80-mt-gd-1_34/regex_debug.obj vc80/boost_regex-vc80-mt-gd-1_34/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-gd-1_34/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-gd-1_34/static_mutex.obj vc80/boost_regex-vc80-mt-gd-1_34/usinstances.obj vc80/boost_regex-vc80-mt-gd-1_34/w32_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/wc_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_34/wide_posix_api.obj vc80/boost_regex-vc80-mt-gd-1_34/winstances.obj
+./vc80/boost_regex-vc80-mt-gd-1_35.lib : vc80/boost_regex-vc80-mt-gd-1_35/c_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/cregex.obj vc80/boost_regex-vc80-mt-gd-1_35/fileiter.obj vc80/boost_regex-vc80-mt-gd-1_35/icu.obj vc80/boost_regex-vc80-mt-gd-1_35/instances.obj vc80/boost_regex-vc80-mt-gd-1_35/posix_api.obj vc80/boost_regex-vc80-mt-gd-1_35/regex.obj vc80/boost_regex-vc80-mt-gd-1_35/regex_debug.obj vc80/boost_regex-vc80-mt-gd-1_35/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-gd-1_35/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-gd-1_35/static_mutex.obj vc80/boost_regex-vc80-mt-gd-1_35/usinstances.obj vc80/boost_regex-vc80-mt-gd-1_35/w32_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/wc_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/wide_posix_api.obj vc80/boost_regex-vc80-mt-gd-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc80/boost_regex-vc80-mt-gd-1_35.pdb" /debug /machine:I386 /out:"vc80/boost_regex-vc80-mt-gd-1_35.dll" /implib:"vc80/boost_regex-vc80-mt-gd-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc80/boost_regex-vc80-mt-gd-1_35/c_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/cregex.obj vc80/boost_regex-vc80-mt-gd-1_35/fileiter.obj vc80/boost_regex-vc80-mt-gd-1_35/icu.obj vc80/boost_regex-vc80-mt-gd-1_35/instances.obj vc80/boost_regex-vc80-mt-gd-1_35/posix_api.obj vc80/boost_regex-vc80-mt-gd-1_35/regex.obj vc80/boost_regex-vc80-mt-gd-1_35/regex_debug.obj vc80/boost_regex-vc80-mt-gd-1_35/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-gd-1_35/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-gd-1_35/static_mutex.obj vc80/boost_regex-vc80-mt-gd-1_35/usinstances.obj vc80/boost_regex-vc80-mt-gd-1_35/w32_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/wc_regex_traits.obj vc80/boost_regex-vc80-mt-gd-1_35/wide_posix_api.obj vc80/boost_regex-vc80-mt-gd-1_35/winstances.obj
 
 ########################################################
 #
-# section for boost_regex-vc80-mt-1_34.lib
+# section for boost_regex-vc80-mt-1_35.lib
 #
 ########################################################
-vc80/boost_regex-vc80-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc80/boost_regex-vc80-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc80/boost_regex-vc80-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/cregex.cpp
+vc80/boost_regex-vc80-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/cregex.cpp
 
-vc80/boost_regex-vc80-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/fileiter.cpp
+vc80/boost_regex-vc80-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/fileiter.cpp
 
-vc80/boost_regex-vc80-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/icu.cpp
+vc80/boost_regex-vc80-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/icu.cpp
 
-vc80/boost_regex-vc80-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/instances.cpp
+vc80/boost_regex-vc80-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/instances.cpp
 
-vc80/boost_regex-vc80-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/posix_api.cpp
+vc80/boost_regex-vc80-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/posix_api.cpp
 
-vc80/boost_regex-vc80-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/regex.cpp
+vc80/boost_regex-vc80-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/regex.cpp
 
-vc80/boost_regex-vc80-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/regex_debug.cpp
+vc80/boost_regex-vc80-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc80/boost_regex-vc80-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc80/boost_regex-vc80-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc80/boost_regex-vc80-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc80/boost_regex-vc80-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc80/boost_regex-vc80-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/static_mutex.cpp
+vc80/boost_regex-vc80-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc80/boost_regex-vc80-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/usinstances.cpp
+vc80/boost_regex-vc80-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/usinstances.cpp
 
-vc80/boost_regex-vc80-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc80/boost_regex-vc80-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc80/boost_regex-vc80-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc80/boost_regex-vc80-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc80/boost_regex-vc80-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc80/boost_regex-vc80-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_34/ -Fdvc80/boost_regex-vc80-mt-1_34.pdb ../src/winstances.cpp
+vc80/boost_regex-vc80-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/boost_regex-vc80-mt-1_35/ -Fdvc80/boost_regex-vc80-mt-1_35.pdb ../src/winstances.cpp
 
-boost_regex-vc80-mt-1_34_dir :
-	@if not exist "vc80\boost_regex-vc80-mt-1_34\$(NULL)" mkdir vc80\boost_regex-vc80-mt-1_34
+boost_regex-vc80-mt-1_35_dir :
+	@if not exist "vc80\boost_regex-vc80-mt-1_35\$(NULL)" mkdir vc80\boost_regex-vc80-mt-1_35
 
-boost_regex-vc80-mt-1_34_clean :
-	del vc80\boost_regex-vc80-mt-1_34\*.obj
-	del vc80\boost_regex-vc80-mt-1_34\*.idb
-	del vc80\boost_regex-vc80-mt-1_34\*.exp
-	del vc80\boost_regex-vc80-mt-1_34\*.pch
+boost_regex-vc80-mt-1_35_clean :
+	del vc80\boost_regex-vc80-mt-1_35\*.obj
+	del vc80\boost_regex-vc80-mt-1_35\*.idb
+	del vc80\boost_regex-vc80-mt-1_35\*.exp
+	del vc80\boost_regex-vc80-mt-1_35\*.pch
 
-./vc80/boost_regex-vc80-mt-1_34.lib : vc80/boost_regex-vc80-mt-1_34/c_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/cregex.obj vc80/boost_regex-vc80-mt-1_34/fileiter.obj vc80/boost_regex-vc80-mt-1_34/icu.obj vc80/boost_regex-vc80-mt-1_34/instances.obj vc80/boost_regex-vc80-mt-1_34/posix_api.obj vc80/boost_regex-vc80-mt-1_34/regex.obj vc80/boost_regex-vc80-mt-1_34/regex_debug.obj vc80/boost_regex-vc80-mt-1_34/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-1_34/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-1_34/static_mutex.obj vc80/boost_regex-vc80-mt-1_34/usinstances.obj vc80/boost_regex-vc80-mt-1_34/w32_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/wc_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/wide_posix_api.obj vc80/boost_regex-vc80-mt-1_34/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc80/boost_regex-vc80-mt-1_34.pdb" /debug /machine:I386 /out:"vc80/boost_regex-vc80-mt-1_34.dll" /implib:"vc80/boost_regex-vc80-mt-1_34.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc80/boost_regex-vc80-mt-1_34/c_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/cregex.obj vc80/boost_regex-vc80-mt-1_34/fileiter.obj vc80/boost_regex-vc80-mt-1_34/icu.obj vc80/boost_regex-vc80-mt-1_34/instances.obj vc80/boost_regex-vc80-mt-1_34/posix_api.obj vc80/boost_regex-vc80-mt-1_34/regex.obj vc80/boost_regex-vc80-mt-1_34/regex_debug.obj vc80/boost_regex-vc80-mt-1_34/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-1_34/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-1_34/static_mutex.obj vc80/boost_regex-vc80-mt-1_34/usinstances.obj vc80/boost_regex-vc80-mt-1_34/w32_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/wc_regex_traits.obj vc80/boost_regex-vc80-mt-1_34/wide_posix_api.obj vc80/boost_regex-vc80-mt-1_34/winstances.obj
+./vc80/boost_regex-vc80-mt-1_35.lib : vc80/boost_regex-vc80-mt-1_35/c_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/cregex.obj vc80/boost_regex-vc80-mt-1_35/fileiter.obj vc80/boost_regex-vc80-mt-1_35/icu.obj vc80/boost_regex-vc80-mt-1_35/instances.obj vc80/boost_regex-vc80-mt-1_35/posix_api.obj vc80/boost_regex-vc80-mt-1_35/regex.obj vc80/boost_regex-vc80-mt-1_35/regex_debug.obj vc80/boost_regex-vc80-mt-1_35/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-1_35/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-1_35/static_mutex.obj vc80/boost_regex-vc80-mt-1_35/usinstances.obj vc80/boost_regex-vc80-mt-1_35/w32_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/wc_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/wide_posix_api.obj vc80/boost_regex-vc80-mt-1_35/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"vc80/boost_regex-vc80-mt-1_35.pdb" /debug /machine:I386 /out:"vc80/boost_regex-vc80-mt-1_35.dll" /implib:"vc80/boost_regex-vc80-mt-1_35.lib" /LIBPATH:"$(STLPORT_PATH)\lib" $(XLFLAGS) $(ICU_LINK_OPTS)  vc80/boost_regex-vc80-mt-1_35/c_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/cpp_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/cregex.obj vc80/boost_regex-vc80-mt-1_35/fileiter.obj vc80/boost_regex-vc80-mt-1_35/icu.obj vc80/boost_regex-vc80-mt-1_35/instances.obj vc80/boost_regex-vc80-mt-1_35/posix_api.obj vc80/boost_regex-vc80-mt-1_35/regex.obj vc80/boost_regex-vc80-mt-1_35/regex_debug.obj vc80/boost_regex-vc80-mt-1_35/regex_raw_buffer.obj vc80/boost_regex-vc80-mt-1_35/regex_traits_defaults.obj vc80/boost_regex-vc80-mt-1_35/static_mutex.obj vc80/boost_regex-vc80-mt-1_35/usinstances.obj vc80/boost_regex-vc80-mt-1_35/w32_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/wc_regex_traits.obj vc80/boost_regex-vc80-mt-1_35/wide_posix_api.obj vc80/boost_regex-vc80-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc80-mt-1_34.lib
+# section for libboost_regex-vc80-mt-1_35.lib
 #
 ########################################################
-vc80/libboost_regex-vc80-mt-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/c_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/c_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/cpp_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/cregex.cpp
+vc80/libboost_regex-vc80-mt-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/cregex.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/fileiter.cpp
+vc80/libboost_regex-vc80-mt-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/fileiter.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/icu.cpp
+vc80/libboost_regex-vc80-mt-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/icu.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/instances.cpp
+vc80/libboost_regex-vc80-mt-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/instances.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/posix_api.cpp
+vc80/libboost_regex-vc80-mt-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/regex.cpp
+vc80/libboost_regex-vc80-mt-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/regex.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/regex_debug.cpp
+vc80/libboost_regex-vc80-mt-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/regex_debug.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/regex_raw_buffer.cpp
+vc80/libboost_regex-vc80-mt-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/regex_traits_defaults.cpp
+vc80/libboost_regex-vc80-mt-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/static_mutex.cpp
+vc80/libboost_regex-vc80-mt-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/static_mutex.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/usinstances.cpp
+vc80/libboost_regex-vc80-mt-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/usinstances.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/w32_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/wc_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/wide_posix_api.cpp
+vc80/libboost_regex-vc80-mt-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/wide_posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_34/ -Fdvc80/libboost_regex-vc80-mt-1_34.pdb ../src/winstances.cpp
+vc80/libboost_regex-vc80-mt-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /EHsc /O2  /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-1_35/ -Fdvc80/libboost_regex-vc80-mt-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc80-mt-1_34_dir :
-	@if not exist "vc80\libboost_regex-vc80-mt-1_34\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-1_34
+libboost_regex-vc80-mt-1_35_dir :
+	@if not exist "vc80\libboost_regex-vc80-mt-1_35\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-1_35
 
-libboost_regex-vc80-mt-1_34_clean :
-	del vc80\libboost_regex-vc80-mt-1_34\*.obj
-	del vc80\libboost_regex-vc80-mt-1_34\*.idb
-	del vc80\libboost_regex-vc80-mt-1_34\*.exp
-	del vc80\libboost_regex-vc80-mt-1_34\*.pch
+libboost_regex-vc80-mt-1_35_clean :
+	del vc80\libboost_regex-vc80-mt-1_35\*.obj
+	del vc80\libboost_regex-vc80-mt-1_35\*.idb
+	del vc80\libboost_regex-vc80-mt-1_35\*.exp
+	del vc80\libboost_regex-vc80-mt-1_35\*.pch
 
-./vc80/libboost_regex-vc80-mt-1_34.lib : vc80/libboost_regex-vc80-mt-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/cregex.obj vc80/libboost_regex-vc80-mt-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-1_34/icu.obj vc80/libboost_regex-vc80-mt-1_34/instances.obj vc80/libboost_regex-vc80-mt-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-1_34/regex.obj vc80/libboost_regex-vc80-mt-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-1_34/winstances.obj
-	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-1_34.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/cregex.obj vc80/libboost_regex-vc80-mt-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-1_34/icu.obj vc80/libboost_regex-vc80-mt-1_34/instances.obj vc80/libboost_regex-vc80-mt-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-1_34/regex.obj vc80/libboost_regex-vc80-mt-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-1_34/winstances.obj
+./vc80/libboost_regex-vc80-mt-1_35.lib : vc80/libboost_regex-vc80-mt-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/cregex.obj vc80/libboost_regex-vc80-mt-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-1_35/icu.obj vc80/libboost_regex-vc80-mt-1_35/instances.obj vc80/libboost_regex-vc80-mt-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-1_35/regex.obj vc80/libboost_regex-vc80-mt-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-1_35/winstances.obj
+	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-1_35.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/cregex.obj vc80/libboost_regex-vc80-mt-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-1_35/icu.obj vc80/libboost_regex-vc80-mt-1_35/instances.obj vc80/libboost_regex-vc80-mt-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-1_35/regex.obj vc80/libboost_regex-vc80-mt-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-1_35/winstances.obj
 
 ########################################################
 #
-# section for libboost_regex-vc80-mt-gd-1_34.lib
+# section for libboost_regex-vc80-mt-gd-1_35.lib
 #
 ########################################################
-vc80/libboost_regex-vc80-mt-gd-1_34/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/c_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/c_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/cpp_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/cpp_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/cregex.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/cregex.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/fileiter.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/fileiter.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/icu.obj: ../src/icu.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/icu.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/icu.obj: ../src/icu.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/icu.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/instances.obj: ../src/instances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/instances.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/instances.obj: ../src/instances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/instances.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/posix_api.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/regex.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/regex.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/regex_debug.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/regex_debug.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/regex_raw_buffer.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/regex_raw_buffer.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/regex_traits_defaults.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/regex_traits_defaults.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/static_mutex.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/static_mutex.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/usinstances.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/usinstances.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/w32_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/w32_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/wc_regex_traits.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/wc_regex_traits.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/wide_posix_api.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/wide_posix_api.cpp
 
-vc80/libboost_regex-vc80-mt-gd-1_34/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_34/ -Fdvc80/libboost_regex-vc80-mt-gd-1_34.pdb ../src/winstances.cpp
+vc80/libboost_regex-vc80-mt-gd-1_35/winstances.obj: ../src/winstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /EHsc /c $(CXXFLAGS) $(ICU_COMPILE_OPTS) -Y- -Fo./vc80/libboost_regex-vc80-mt-gd-1_35/ -Fdvc80/libboost_regex-vc80-mt-gd-1_35.pdb ../src/winstances.cpp
 
-libboost_regex-vc80-mt-gd-1_34_dir :
-	@if not exist "vc80\libboost_regex-vc80-mt-gd-1_34\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-gd-1_34
+libboost_regex-vc80-mt-gd-1_35_dir :
+	@if not exist "vc80\libboost_regex-vc80-mt-gd-1_35\$(NULL)" mkdir vc80\libboost_regex-vc80-mt-gd-1_35
 
-libboost_regex-vc80-mt-gd-1_34_clean :
-	del vc80\libboost_regex-vc80-mt-gd-1_34\*.obj
-	del vc80\libboost_regex-vc80-mt-gd-1_34\*.idb
-	del vc80\libboost_regex-vc80-mt-gd-1_34\*.exp
-	del vc80\libboost_regex-vc80-mt-gd-1_34\*.pch
+libboost_regex-vc80-mt-gd-1_35_clean :
+	del vc80\libboost_regex-vc80-mt-gd-1_35\*.obj
+	del vc80\libboost_regex-vc80-mt-gd-1_35\*.idb
+	del vc80\libboost_regex-vc80-mt-gd-1_35\*.exp
+	del vc80\libboost_regex-vc80-mt-gd-1_35\*.pch
 
-./vc80/libboost_regex-vc80-mt-gd-1_34.lib : vc80/libboost_regex-vc80-mt-gd-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/cregex.obj vc80/libboost_regex-vc80-mt-gd-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-gd-1_34/icu.obj vc80/libboost_regex-vc80-mt-gd-1_34/instances.obj vc80/libboost_regex-vc80-mt-gd-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-gd-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-gd-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-gd-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_34/winstances.obj
-	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-gd-1_34.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-gd-1_34/c_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/cregex.obj vc80/libboost_regex-vc80-mt-gd-1_34/fileiter.obj vc80/libboost_regex-vc80-mt-gd-1_34/icu.obj vc80/libboost_regex-vc80-mt-gd-1_34/instances.obj vc80/libboost_regex-vc80-mt-gd-1_34/posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex_debug.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-gd-1_34/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-gd-1_34/static_mutex.obj vc80/libboost_regex-vc80-mt-gd-1_34/usinstances.obj vc80/libboost_regex-vc80-mt-gd-1_34/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_34/wide_posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_34/winstances.obj
+./vc80/libboost_regex-vc80-mt-gd-1_35.lib : vc80/libboost_regex-vc80-mt-gd-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/cregex.obj vc80/libboost_regex-vc80-mt-gd-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-gd-1_35/icu.obj vc80/libboost_regex-vc80-mt-gd-1_35/instances.obj vc80/libboost_regex-vc80-mt-gd-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-gd-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-gd-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-gd-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_35/winstances.obj
+	link -lib /nologo /out:vc80/libboost_regex-vc80-mt-gd-1_35.lib $(XSFLAGS)  vc80/libboost_regex-vc80-mt-gd-1_35/c_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/cpp_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/cregex.obj vc80/libboost_regex-vc80-mt-gd-1_35/fileiter.obj vc80/libboost_regex-vc80-mt-gd-1_35/icu.obj vc80/libboost_regex-vc80-mt-gd-1_35/instances.obj vc80/libboost_regex-vc80-mt-gd-1_35/posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex_debug.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex_raw_buffer.obj vc80/libboost_regex-vc80-mt-gd-1_35/regex_traits_defaults.obj vc80/libboost_regex-vc80-mt-gd-1_35/static_mutex.obj vc80/libboost_regex-vc80-mt-gd-1_35/usinstances.obj vc80/libboost_regex-vc80-mt-gd-1_35/w32_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/wc_regex_traits.obj vc80/libboost_regex-vc80-mt-gd-1_35/wide_posix_api.obj vc80/libboost_regex-vc80-mt-gd-1_35/winstances.obj
 
diff --git a/build/vc_gen.sh b/build/vc_gen.sh
index 6ef5d0f6..2b3cb28a 100644
--- a/build/vc_gen.sh
+++ b/build/vc_gen.sh
@@ -121,7 +121,7 @@ EOF
 #
 #	 now for the main target for this library:
 	echo ./$subdir$stlport_suffix/$libname.lib : $all_obj >> $tout
-	echo "	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:\"$subdir$stlport_suffix/$libname.pdb\" /debug /machine:I386 /out:\"$subdir$stlport_suffix/$libname.dll\" /implib:\"$subdir$stlport_suffix/$libname.lib\" /LIBPATH:\"\$(STLPORT_PATH)\\lib\" \$(XLFLAGS) \$(ICU_LINK_OPTS) $all_obj" >> $tout
+	echo "	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:\"$subdir$stlport_suffix/$libname.pdb\" /debug /machine:I386 /out:\"$subdir$stlport_suffix/$libname.dll\" /implib:\"$subdir$stlport_suffix/$libname.lib\" /LIBPATH:\"\$(STLPORT_PATH)\\lib\" \$(XLFLAGS) \$(ICU_LINK_OPTS) $all_obj" >> $tout
 	echo "" >> $tout
 }
 
@@ -489,3 +489,4 @@ rm -f $tout $iout
 
 
 
+
diff --git a/doc/Attic/bad_expression.html b/doc/Attic/bad_expression.html
deleted file mode 100644
index aee75368..00000000
--- a/doc/Attic/bad_expression.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: regex_error</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class regex_error</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Synopsis</h3>
-      <p>#include &lt;<a href="../../../boost/regex/pattern_except.hpp">boost/pattern_except.hpp</a>&gt;</p>
-      <p>The class <code>regex_error</code> defines the type of objects thrown as 
-         exceptions to report errors during the conversion from a string representing a 
-         regular expression to a finite state machine.&nbsp;&nbsp;</p>
-      <pre>
-<b>namespace</b> boost{
-
-<b>class</b> regex_error : <b>public</b> std::runtime_error
-{
-<b>public</b>:
-   <b>explicit</b> regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type err</a>, std::ptrdiff_t pos);
-   <b>explicit</b> regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);
-   <a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;
-   std::ptrdiff_t position()<b>const</b>;
-};
-
-typedef regex_error bad_pattern; // for backwards compatibility
-typedef regex_error bad_expression; // for backwards compatibility
-
-} // namespace boost
-</pre>
-      <h3>Description</h3>
-      <pre>
-regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type</a> err, std::ptrdiff_t pos);
-regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>regex_error</code>.</p>
-      <pre>
-<a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;</pre>
-      <p><b>Effects:</b> returns the error code that represents parsing error that occurred.</p>
-      <pre>
-std::ptrdiff_t position()<b>const</b>; </pre>
-      <p><b>Effects:</b> returns the location in the expression where parsing stopped.</p>
-      <P>Footnotes: the choice of <code>std::runtime_error</code> as the base class for <code>
-            regex_error</code> is moot; depending upon how the library is used 
-         exceptions may be either logic errors (programmer supplied expressions) or run 
-         time errors (user supplied expressions).&nbsp; The library previously used <code>bad_pattern</code>
-         and <code>bad_expression</code> for errors, these have been replaced by the 
-         single class <code>regex_error</code> to keep the library in synchronization 
-         with the standardization proposal.</P>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/basic_regex.html b/doc/Attic/basic_regex.html
deleted file mode 100644
index 16774739..00000000
--- a/doc/Attic/basic_regex.html
+++ /dev/null
@@ -1,906 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: basic_regex</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">basic_regex</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Synopsis</h3>
-      <pre>
-#include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
-</pre>
-      <p>The template class <em>basic_regex</em> encapsulates regular expression parsing 
-         and compilation. The class takes two template parameters:</p>
-      <p><b><i>charT</i></b>: determines the character type, i.e. either char or 
-         wchar_t; see <EM><A href="concepts.html#charT">charT concept</A></EM>.</p>
-      <p><b><i>traits</i></b>: determines the behavior of the character type, for 
-         example which character class names are recognized. A default traits class is 
-         provided: <a href="regex_traits.html">regex_traits&lt;charT&gt;</a>.&nbsp; See 
-         also <EM><A href="concepts.html#traits">traits concept</A></EM>.</p>
-      <p>For ease of use there are two typedefs that define the two standard <i>basic_regex</i>
-         instances, unless you want to use custom traits classes or non-standard 
-         character types, you won't need to use anything other than these:</p>
-      <pre>
-<b>namespace</b> boost{
-<b>template</b> &lt;<b>class</b> charT, <b>class</b> traits = regex_traits&lt;charT&gt;  &gt;
-<b>class</b> basic_regex;
-<b>typedef</b> basic_regex&lt;<b>char</b>&gt;      regex;
-<b>typedef</b> basic_regex&lt;<b>wchar_t&gt;</b>   wregex;
-}
-</pre>
-      <p>The definition of <i>basic_regex</i> follows: it is based very closely on class 
-         basic_string, and fulfils the requirements for a constant-container of <i>charT</i>.</p>
-      <pre>
-namespace boost{
-
-template &lt;class  charT, class traits = regex_traits&lt;charT&gt; &gt;
-class basic_regex {
-   public:          
-   // types:
-   typedef          charT                                value_type;
-   typedef          implementation-specific              const_iterator;
-   typedef          const_iterator                       iterator;                 
-   typedef          charT&amp;                               reference;           
-   typedef          const charT&amp;                         const_reference;           
-   typedef          std::ptrdiff_t                       difference_type;                 
-   typedef          std::size_t                          size_type;
-   typedef          regex_constants::syntax_option_type  flag_type;
-   typedef typename traits::locale_type                  locale_type;
-
-   // constants:
-   // main option selection:
-   static const regex_constants::syntax_option_type normal          = regex_constants::normal;
-   static const regex_constants::syntax_option_type ECMAScript      = normal;
-   static const regex_constants::syntax_option_type JavaScript      = normal;
-   static const regex_constants::syntax_option_type JScript         = normal;
-   static const regex_constants::syntax_option_type basic           = regex_constants::basic;
-   static const regex_constants::syntax_option_type extended        = regex_constants::extended;
-   static const regex_constants::syntax_option_type awk             = regex_constants::awk;
-   static const regex_constants::syntax_option_type grep            = regex_constants::grep;
-   static const regex_constants::syntax_option_type egrep           = regex_constants::egrep;
-   static const regex_constants::syntax_option_type sed             = basic = regex_constants::sed;
-   static const regex_constants::syntax_option_type perl            = regex_constants::perl;
-   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        = regex_constants::no_mod_m;
-   static const regex_constants::syntax_option_type no_mod_s        = regex_constants::no_mod_s;
-   static const regex_constants::syntax_option_type mod_s           = regex_constants::mod_s;
-   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      = regex_constants::bk_plus_qm;
-   static const regex_constants::syntax_option_type bk_vbar         = regex_constants::bk_vbar
-   static const regex_constants::syntax_option_type no_char_classes = regex_constants::no_char_classes
-   static const regex_constants::syntax_option_type no_intervals    = regex_constants::no_intervals
-   // common modifiers:
-   static const regex_constants::syntax_option_type nosubs          = regex_constants::nosubs;
-   static const regex_constants::syntax_option_type optimize        = regex_constants::optimize;
-   static const regex_constants::syntax_option_type collate         = regex_constants::collate;
-   static const regex_constants::syntax_option_type newline_alt     = regex_constants::newline_alt;
-   static const regex_constants::syntax_option_type no_except       = regex_constants::newline_alt;
-
-   // construct/copy/destroy:
-   explicit <A href="#c1">basic_regex</A> ();
-   explicit <A href="#c2">basic_regex</A>(const  charT* p, flag_type f = regex_constants::normal);
-   <A href="#c3">basic_regex</A>(const charT* p1, const  charT* p2, flag_type f = regex_constants::normal);
-   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type  f);
-   <A href="#c5">basic_regex</A>(const basic_regex&amp;);
-   template &lt;class ST, class SA&gt;
-   explicit <A href="#c6">basic_regex</A>(const basic_string&lt;charT, ST,  SA&gt;&amp; p, flag_type f = regex_constants::normal);
-   template &lt;class InputIterator&gt;
-   <A href="#c7">basic_regex</A>(InputIterator first,  InputIterator last, flag_type f = regex_constants::normal);
-
-   ~basic_regex();
-   basic_regex&amp; <A href="#o1">operator</A>=(const basic_regex&amp;);
-   basic_regex&amp; <A href="#o2">operator</A>= (const charT* ptr); 
-   template &lt;class ST, class SA&gt; 
-   basic_regex&amp; <A href="#o3">operator</A>= (const basic_string&lt;charT, ST, SA&gt;&amp; p);
-   // iterators: 
-   const_iterator <A href="#m1">begin</A>() const; 
-   const_iterator <A href="#m2">end</A>() const;
-   // capacity: 
-   size_type <A href="#m3">size</A>() const; 
-   size_type <A href="#m4">max_size</A>() const; 
-   bool <A href="#m5">empty</A>() const; 
-   unsigned <A href="#m6">mark_count</A>()const; 
-   //
-   // modifiers: 
-   basic_regex&amp; <A href="#a1">assign</A>(const basic_regex&amp; that); 
-   basic_regex&amp; <A href="#a2">assign</A>(const charT* ptr, flag_type f = regex_constants::normal);
-   basic_regex&amp; <A href="#a3">assign</A>(const charT* ptr, unsigned int len, flag_type f);
-   template &lt;class string_traits, class A&gt;
-   basic_regex&amp; <A href="#a4">assign</A>(const basic_string&lt;charT, string_traits, A&gt;&amp; s,
-                       flag_type f = regex_constants::normal);
-   template &lt;class InputIterator&gt;
-   basic_regex&amp; <A href="#a5">assign</A>(InputIterator first, InputIterator last,
-                       flag_type f = regex_constants::normal);
-
-   // const operations:
-   flag_type <A href="#m8">flags</A>() const;
-   int <A href="#m8b">status</A>()const;
-   basic_string&lt;charT&gt; <A href="#m9">str</A>() const;
-   int <A href="#m10">compare</A>(basic_regex&amp;) const;
-   // locale:
-   locale_type <A href="#m11">imbue</A>(locale_type loc);
-   locale_type <A href="#m12">getloc</A>() const;
-   // swap
-   void <A href="#m13">swap</A>(basic_regex&amp;) throw();
-};
-
-template &lt;class charT, class traits&gt;
-bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-
-template &lt;class charT, class io_traits, class re_traits&gt;
-basic_ostream&lt;charT, io_traits&gt;&amp;
-   <A href="#o11">operator</A> &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os,
-                const basic_regex&lt;charT, re_traits&gt;&amp; e);
-
-template &lt;class charT, class traits&gt;
-void <A href="#o12">swap</A>(basic_regex&lt;charT, traits&gt;&amp; e1,
-          basic_regex&lt;charT, traits&gt;&amp; e2);
-
-typedef basic_regex&lt;char&gt; regex;
-typedef basic_regex&lt;wchar_t&gt; wregex;
-
-} // namespace boost
-</pre>
-      <h3>Description</h3>
-      <p>Class&nbsp;<em>basic_regex</em> has the following public member functions:</p>
-      <h4>basic_regex constants</h4>
-      <pre>
-// main option selection:
-static const regex_constants::syntax_option_type normal           = regex_constants::normal;
-static const regex_constants::syntax_option_type ECMAScript       = normal;
-static const regex_constants::syntax_option_type JavaScript       = normal;
-static const regex_constants::syntax_option_type JScript          = normal;
-static const regex_constants::syntax_option_type basic            = regex_constants::basic;
-static const regex_constants::syntax_option_type extended         = regex_constants::extended;
-static const regex_constants::syntax_option_type awk              = regex_constants::awk;
-static const regex_constants::syntax_option_type grep             = regex_constants::grep;
-static const regex_constants::syntax_option_type egrep            = regex_constants::egrep;
-static const regex_constants::syntax_option_type sed              = regex_constants::sed;
-static const regex_constants::syntax_option_type perl             = regex_constants::perl;
-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         = regex_constants::no_mod_m;
-static const regex_constants::syntax_option_type no_mod_s         = regex_constants::no_mod_s;
-static const regex_constants::syntax_option_type mod_s            = regex_constants::mod_s;
-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       = regex_constants::bk_plus_qm;
-static const regex_constants::syntax_option_type bk_vbar          = regex_constants::bk_vbar
-static const regex_constants::syntax_option_type no_char_classes  = regex_constants::no_char_classes
-static const regex_constants::syntax_option_type no_intervals     = regex_constants::no_intervals
-// common modifiers:
-static const regex_constants::syntax_option_type nosubs           = regex_constants::nosubs;
-static const regex_constants::syntax_option_type optimize         = regex_constants::optimize;
-static const regex_constants::syntax_option_type collate          = regex_constants::collate;
-static const regex_constants::syntax_option_type newline_alt      = regex_constants::newline_alt;
-</pre>
-      <p>The static constant members are provided as synonyms for the constants declared 
-         in namespace <code>boost::regex_constants</code>; for each constant of type <code><A href="syntax_option_type.html">
-               syntax_option_type</A></code> declared in namespace <code>boost::regex_constants</code>
-         then a constant with the same name, type and value is declared within the scope 
-         of <code>basic_regex</code>.</p>
-      <h4>basic_regex constructors</h4>
-      <pre><A name=c1> basic_regex();
-</pre>
-      <P><b>Effects:</b> Constructs an object of class <code>basic_regex</code>. The 
-         postconditions of this function are indicated in the table:</P>
-      <div align="center">
-         <center>
-            <table id="Table2" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>true</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>0</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;()</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><A name=c2><BR> basic_regex(const charT* p, flag_type f = regex_constants::normal);
- 
-</pre>
-      <P><b>Requires:</b> <i>p</i> shall not be a null pointer.</P>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>p</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the null-terminated string <i>p</i>, and interpreted 
-         according to the <a href="syntax_option_type.html">option flags</a>&nbsp;specified 
-         in <i>f</i>. The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table3" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>char_traits&lt;charT&gt;::length(p)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(p)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre>
- 
-</pre>
-      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal);</PRE>
-      <p><b>Requires:</b> <i>p1</i> and <i>p2</i> are not null pointers, <code>p1 &lt; p2</code>.</p>
-      <p><b>Throws:</b> <code>bad_expression</code> if [p1,p2) is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the sequence of characters [p1,p2), and interpreted 
-         according the <a href="syntax_option_type.html">option flags</a> specified in <i>f</i>. 
-         The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table4" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>std::distance(p1,p2)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(p1,p2)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre>
- 
-</pre>
-      <pre><A name=c4></A>basic_regex(const charT* p, size_type len, flag_type f);
-</pre>
-      <p><b>Requires:</b> <i>p</i> shall not be a null pointer, <code>len &lt; max_size()</code>.</p>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>p</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the sequence of characters [p, p+len), and interpreted 
-         according the <a href="syntax_option_type.html">option flags</a> specified in <i>f</i>. 
-         The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table5" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>len</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(p, len)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><A name=c5></A><BR>basic_regex(const basic_regex&amp; e);
-</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code> as a 
-         copy of the object <i>e</i>. The postconditions of this function are indicated 
-         in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table6" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.empty()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.size()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.str()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.flags()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.mark_count()</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><BR>
-template &lt;class ST, class SA&gt;
-<A name=c6></A>basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s, flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>s</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the string <i>s</i>, and interpreted according to the <a href="syntax_option_type.html">
-            option flags</a> specified in <i>f</i>. The postconditions of this function 
-         are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table7" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s.size()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><BR>
-template &lt;class ForwardIterator&gt;
-<A name=c7></A>basic_regex(ForwardIterator first, ForwardIterator last, flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Throws:</b> <code>bad_expression</code> if the sequence <i>[first, last)</i> 
-         is not a valid regular expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the sequence of characters [first, last), and 
-         interpreted according to the <a href="syntax_option_type.html">option flags</a> 
-         specified in <i>f</i>. The postconditions of this function are indicated in the 
-         table:</p>
-      <div align="center">
-         <center>
-            <table id="Table8" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>distance(first,last)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(first,last)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><A name=o1></A>
-basic_regex&amp; operator=(const basic_regex&amp; e);
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>assign(e.str(), e.flags())</code>.</p>
-      <pre><A name=o2></A>basic_regex&amp; operator=(const charT* ptr);
-</pre>
-      <p><b>Requires:</b> <i>p</i> shall not be a null pointer.</p>
-      <p><b>Effects:</b> Returns the result of <code>assign(ptr)</code>.</p>
-      <pre><A name=o3></A>
-template &lt;class ST, class SA&gt;
-basic_regex&amp; operator=(const basic_string&lt;charT, ST, SA&gt;&amp; p);
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>assign(p)</code>.</p>
-      <h4>basic_regex iterators</h4>
-      <pre><A name=m1>
-const_iterator begin() const;
-</pre>
-      <p><b>Effects:</b> Returns a starting iterator to a sequence of characters 
-         representing the regular expression.</p>
-      <pre><A name=m2>
-const_iterator end() const;
-</pre>
-      <p><b>Effects:</b> Returns termination iterator to a sequence of characters 
-         representing the regular expression.</p>
-      <h4>basic_regex capacity</h4>
-      <pre><A name=m3>
-size_type size() const;
-</pre>
-      <p><b>Effects:</b> Returns the length of the sequence of characters representing 
-         the regular expression.</p>
-      <pre><A name=m4>
-size_type max_size() const;
-</pre>
-      <p><b>Effects:</b> Returns the maximum length of the sequence of characters 
-         representing the regular expression.</p>
-      <pre><A name=m5></A>
-bool empty() const;
-</pre>
-      <p><b>Effects:</b> Returns <b>true</b> if the object does not contain a valid 
-         regular expression, otherwise <b>false</b>.</p>
-      <pre><A name=m6></A>unsigned mark_count() const;
-</pre>
-      <p><b>Effects:</b> Returns the number of marked sub-expressions within the regular 
-         expresion.</p>
-      <h4>basic_regex assign</h4>
-      <pre><A name=a1>
-basic_regex&amp; assign(const basic_regex&amp; that);
-</pre>
-      <p><b>Effects:</b> Returns <code>assign(that.str(), that.flags())</code>.</p>
-      <pre><A name=a2></A>
-basic_regex&amp; assign(const charT* ptr, flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Effects:</b> Returns <code>assign(string_type(ptr), f)</code>.</p>
-      <PRE><A name=a3></A><A name=a3></A>basic_regex&amp; assign(const charT* ptr, unsigned int len, flag_type f);</PRE>
-      <P><B>Effects:</B> Returns <CODE>assign(string_type(ptr, len), f)</CODE>.</P>
-      <PRE><A name=a4></A>template &lt;class string_traits, class A&gt;
-<A name=a6></A>basic_regex&amp; assign(const basic_string&lt;charT, string_traits, A&gt;&amp; s,
-                    flag_type f = regex_constants::normal);
-</PRE>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>s</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Returns:</b> <code>*this</code>.</p>
-      <p><b>Effects:</b> Assigns the regular expression contained in the string <i>s</i>, 
-         interpreted according the <a href="syntax_option_type.html">option flags</a> specified 
-         in <i>f</i>. The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table9" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s.size()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre>
- 
-</pre>
-      <pre><A name=a5></A>template &lt;class InputIterator&gt;
-basic_regex&amp; assign(InputIterator first, InputIterator last,
-                    flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Requires:</b> The type InputIterator corresponds to the Input Iterator 
-         requirements (24.1.1).</p>
-      <p><b>Effects:</b> Returns <code>assign(string_type(first, last), f)</code>.</p>
-      <h4>basic_regex constant operations</h4>
-      <pre><A name=m7></A><A name=m8></A>flag_type flags() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the regular expression syntax flags that were 
-         passed to the object's constructor, or the last call to <code>assign.</code></p>
-      <CODE>
-         <PRE><A name=m7></A><A name=m8></A><A name=m8b></A>int status() const;</PRE>
-      </CODE>
-      <P><STRONG>Effects</STRONG>: Returns zero if the expression contains a valid 
-         regular expression, otherwise an <A href="error_type.html">error code</A>.&nbsp; 
-         This member function is retained for use in environments that cannot use 
-         exception handling.</P>
-      <pre><A name=m9></A>basic_string&lt;charT&gt; str() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the character sequence passed to the object's 
-         constructor, or the last call to <code>assign.</code></p>
-      <pre><A name=m10></A>int compare(basic_regex&amp; e)const;
-</pre>
-      <p><b>Effects:</b> If <code>flags() == e.flags()</code> then returns <code>str().compare(e.str())</code>, 
-         otherwise returns <code>flags() - e.flags()</code>.</p>
-      <h4>basic_regex locale</h4>
-      <pre><A name=m11></A>locale_type imbue(locale_type l);
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>traits_inst.imbue(l)</code> where <code>
-            traits_inst</code> is a (default initialized) instance of the template 
-         parameter <code>traits</code> stored within the object. Calls to imbue 
-         invalidate any currently contained regular expression.</p>
-      <p><b>Postcondition:</b> <code>empty() == true</code>.</p>
-      <pre><A name=m12></A>
-locale_type getloc() const;
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>traits_inst.getloc()</code> where <code>
-            traits_inst</code> is a (default initialized) instance of the template 
-         parameter <code>traits</code> stored within the object.</p>
-      <h4>basic_regex swap</h4>
-      <pre><A name=m13>
-void swap(basic_regex&amp; e) throw();
-</pre>
-      <p><b>Effects:</b> Swaps the contents of the two regular expressions.</p>
-      <p><b>Postcondition:</b> <code>*this</code> contains the characters that were in <i>e</i>,
-         <i>e</i> contains the regular expression that was in <code>*this</code>.</p>
-      <p><b>Complexity:</b> constant time.</p>
-      <h4>basic_regex non-member functions</h4>
-      <h5>basic_regex non-member comparison operators&nbsp;</h5>
-      <P>Comparisons between basic_regex objects are provided on an experimental basis: 
-         please note that these are likely to be removed from the standard library 
-         proposal, so use with care if you are writing portable code.</P>
-      <pre><A name=o4></A>
-template &lt;class charT, class traits&gt;
-bool operator == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) == 0</code>.</p>
-      <pre><A name=o5></A>
-template &lt;class charT, class traits&gt;
-bool operator != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) != 0</code>.</p>
-      <pre><A name=o7></A>
-template &lt;class charT, class traits&gt;
-bool operator &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt; 0</code>.</p>
-      <pre><A name=o8></A>
-template &lt;class charT, class traits&gt;
-bool operator &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt;= 0</code>.</p>
-      <pre><A name=o9></A>
-template &lt;class charT, class traits&gt;
-bool operator &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt;= 0</code>.</p>
-      <pre><A name=o10></A>
-template &lt;class charT, class traits&gt;
-bool operator &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt; 0</code>.</p>
-      <h5>basic_regex inserter.</h5>
-      <P>The basic_regex stream inserter is provided on an experimental basis, and 
-         outputs the textual representation of the expression to the stream:</P>
-      <pre><A name=o11></A>
-template &lt;class charT, class io_traits, class re_traits&gt;
-basic_ostream&lt;charT, io_traits&gt;&amp;
-   operator &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os
-                const basic_regex&lt;charT, re_traits&gt;&amp; e);
-</pre>
-      <p><b>Effects:</b> Returns (os &lt;&lt; e.str()).</p>
-      <h5>basic_regex non-member swap</h5>
-      <pre><A name=o12></A>
-template &lt;class charT, class traits&gt;
-void swap(basic_regex&lt;charT, traits&gt;&amp; lhs,
-          basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> calls <code>lhs.swap(rhs)</code>.</p>
-      <hr>
-      <p>Revised 7 Aug 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/captures.html b/doc/Attic/captures.html
deleted file mode 100644
index fe0232f8..00000000
--- a/doc/Attic/captures.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Understanding Captures</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Understanding Captures</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Captures are the iterator ranges that are "captured" by marked sub-expressions 
-         as a regular expression gets matched.&nbsp; Each marked sub-expression can 
-         result in more than one capture, if it is matched more than once.&nbsp; This 
-         document explains how captures and marked sub-expressions in Boost.Regex are 
-         represented and accessed.</P>
-      <H2>Marked sub-expressions</H2>
-      <P>Every time a Perl regular expression contains a parenthesis group (), it spits 
-         out an extra field, known as a marked sub-expression, for example the 
-         expression:</P>
-      <PRE>(\w+)\W+(\w+)</PRE>
-      <P>
-         Has two marked sub-expressions (known as $1 and $2 respectively), in addition 
-         the complete match is known as $&amp;, everything before the first match as $`, 
-         and everything after the match as $'.&nbsp; So if the above expression is 
-         searched for within "@abc def--", then we obtain:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="300" border="0">
-               <TR>
-                  <TD>
-                     <P dir="ltr" style="MARGIN-RIGHT: 0px">$`</P>
-                  </TD>
-                  <TD>"@"</TD>
-               </TR>
-               <TR>
-                  <TD>$&amp;</TD>
-                  <TD>"abc def"</TD>
-               </TR>
-               <TR>
-                  <TD>$1</TD>
-                  <TD>"abc"</TD>
-               </TR>
-               <TR>
-                  <TD>$2</TD>
-                  <TD>"def"</TD>
-               </TR>
-               <TR>
-                  <TD>$'</TD>
-                  <TD>"--"</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </BLOCKQUOTE>
-      <P>In Boost.regex all these are accessible via the <A href="match_results.html">match_results</A>
-         class that gets filled in when calling one of the matching algorithms (<A href="regex_search.html">regex_search</A>,
-         <A href="regex_match.html">regex_match</A>, or <A href="regex_iterator.html">regex_iterator</A>).&nbsp; 
-         So given:</P>
-      <PRE>boost::match_results&lt;IteratorType&gt; m;</PRE>
-      <P>The Perl and Boost.Regex equivalents are as follows:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>
-            <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="300" border="0">
-               <TR>
-                  <TD><STRONG>Perl</STRONG></TD>
-                  <TD><STRONG>Boost.Regex</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>$`</TD>
-                  <TD>m.prefix()</TD>
-               </TR>
-               <TR>
-                  <TD>$&amp;</TD>
-                  <TD>m[0]</TD>
-               </TR>
-               <TR>
-                  <TD>$n</TD>
-                  <TD>m[n]</TD>
-               </TR>
-               <TR>
-                  <TD>$'</TD>
-                  <TD>m.suffix()</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </BLOCKQUOTE>
-      <P>
-      <P>In Boost.Regex each sub-expression match is represented by a <A href="sub_match.html">
-            sub_match</A> object, this is basically just a pair of iterators denoting 
-         the start and end possition of the sub-expression match, but there are some 
-         additional operators provided so that objects of type sub_match behave a lot 
-         like a std::basic_string: for example they are implicitly <A href="sub_match.html#m3">
-            convertible to a basic_string</A>, they can be <A href="sub_match.html#o21">compared 
-            to a string</A>, <A href="sub_match.html#o81">added to a string</A>, or <A href="sub_match.html#oi">
-            streamed out to an output stream</A>.</P>
-      <H2>Unmatched Sub-Expressions</H2>
-      <P>When a regular expression match is found there is no need for all of the marked 
-         sub-expressions to have participated in the match, for example the expression:</P>
-      <P>(abc)|(def)</P>
-      <P>can match either $1 or $2, but never both at the same time.&nbsp; In 
-         Boost.Regex you can determine which sub-expressions matched by accessing the <A href="sub_match.html#m1">
-            sub_match::matched</A> data member.</P>
-      <H2>Repeated Captures</H2>
-      <P>When a marked sub-expression is repeated, then the sub-expression gets 
-         "captured" multiple times, however normally only the final capture is 
-         available, for example if</P>
-      <PRE>(?:(\w+)\W+)+</PRE>
-      <P>is matched against</P>
-      <PRE>one fine day</PRE>
-      <P>Then $1 will contain the string "day", and all the previous captures will have 
-         been forgotten.</P>
-      <P>However, Boost.Regex has an experimental feature that allows all the capture 
-         information to be retained - this is accessed either via the <A href="match_results.html#m17">
-            match_results::captures</A> member function or the <A href="sub_match.html#m8">sub_match::captures</A>
-         member function.&nbsp; These functions return a container that contains a 
-         sequence of all the captures obtained during the regular expression 
-         matching.&nbsp; The following example program shows how this information may be 
-         used:</P>
-      <PRE>#include &lt;boost/regex.hpp&gt;
-#include &lt;iostream&gt;
-
-
-void print_captures(const std::string&amp; regx, const std::string&amp; text)
-{
-   boost::regex e(regx);
-   boost::smatch what;
-   std::cout &lt;&lt; "Expression:  \"" &lt;&lt; regx &lt;&lt; "\"\n";
-   std::cout &lt;&lt; "Text:        \"" &lt;&lt; text &lt;&lt; "\"\n";
-   if(boost::regex_match(text, what, e, boost::match_extra))
-   {
-      unsigned i, j;
-      std::cout &lt;&lt; "** Match found **\n   Sub-Expressions:\n";
-      for(i = 0; i &lt; what.size(); ++i)
-         std::cout &lt;&lt; "      $" &lt;&lt; i &lt;&lt; " = \"" &lt;&lt; what[i] &lt;&lt; "\"\n";
-      std::cout &lt;&lt; "   Captures:\n";
-      for(i = 0; i &lt; what.size(); ++i)
-      {
-         std::cout &lt;&lt; "      $" &lt;&lt; i &lt;&lt; " = {";
-         for(j = 0; j &lt; what.captures(i).size(); ++j)
-         {
-            if(j)
-               std::cout &lt;&lt; ", ";
-            else
-               std::cout &lt;&lt; " ";
-            std::cout &lt;&lt; "\"" &lt;&lt; what.captures(i)[j] &lt;&lt; "\"";
-         }
-         std::cout &lt;&lt; " }\n";
-      }
-   }
-   else
-   {
-      std::cout &lt;&lt; "** No Match found **\n";
-   }
-}
-
-int main(int , char* [])
-{
-   print_captures("(([[:lower:]]+)|([[:upper:]]+))+", "aBBcccDDDDDeeeeeeee");
-   print_captures("(.*)bar|(.*)bah", "abcbar");
-   print_captures("(.*)bar|(.*)bah", "abcbah");
-   print_captures("^(?:(\\w+)|(?&gt;\\W+))*$", "now is the time for all good men to come to the aid of the party");
-   return 0;
-}</PRE>
-      <P>Which produces the following output:</P>
-      <PRE>Expression:  "(([[:lower:]]+)|([[:upper:]]+))+"
-Text:        "aBBcccDDDDDeeeeeeee"
-** Match found **
-   Sub-Expressions:
-      $0 = "aBBcccDDDDDeeeeeeee"
-      $1 = "eeeeeeee"
-      $2 = "eeeeeeee"
-      $3 = "DDDDD"
-   Captures:
-      $0 = { "aBBcccDDDDDeeeeeeee" }
-      $1 = { "a", "BB", "ccc", "DDDDD", "eeeeeeee" }
-      $2 = { "a", "ccc", "eeeeeeee" }
-      $3 = { "BB", "DDDDD" }
-Expression:  "(.*)bar|(.*)bah"
-Text:        "abcbar"
-** Match found **
-   Sub-Expressions:
-      $0 = "abcbar"
-      $1 = "abc"
-      $2 = ""
-   Captures:
-      $0 = { "abcbar" }
-      $1 = { "abc" }
-      $2 = { }
-Expression:  "(.*)bar|(.*)bah"
-Text:        "abcbah"
-** Match found **
-   Sub-Expressions:
-      $0 = "abcbah"
-      $1 = ""
-      $2 = "abc"
-   Captures:
-      $0 = { "abcbah" }
-      $1 = { }
-      $2 = { "abc" }
-Expression:  "^(?:(\w+)|(?&gt;\W+))*$"
-Text:        "now is the time for all good men to come to the aid of the party"
-** Match found **
-   Sub-Expressions:
-      $0 = "now is the time for all good men to come to the aid of the party"
-      $1 = "party"
-   Captures:
-      $0 = { "now is the time for all good men to come to the aid of the party" }
-      $1 = { "now", "is", "the", "time", "for", "all", "good", "men", "to", "come", "to", "the", "aid", "of", "the", "party" }
-</PRE>
-      <P>Unfortunately enabling this feature has an impact on performance (even if you 
-         don't use it), and a much bigger impact if you do use it, therefore to use this 
-         feature you need to:</P>
-      <UL>
-         <LI>
-            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 <A href="../../../boost/regex/user.hpp">
-               boost/regex/user.hpp</A>
-         and then rebuild everything.
-         <LI>
-            Pass the <A href="match_flag_type.html">match_extra flag</A> to the particular 
-            algorithms where you actually need the captures information (<A href="regex_search.html">regex_search</A>,
-            <A href="regex_match.html">regex_match</A>, or <A href="regex_iterator.html">regex_iterator</A>).
-         </LI>
-      </UL>
-      <P>
-         <HR>
-      <P></P>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         12&nbsp;Dec 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp; 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/character_class_names.html b/doc/Attic/character_class_names.html
deleted file mode 100644
index 576e45d0..00000000
--- a/doc/Attic/character_class_names.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Character Class Names</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Character Class Names.</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#always">Character Classes that are Always Supported</a> <dt><a href="#unicode">
-                  Character classes that are supported by Unicode Regular Expressions</a></dt>
-      </dl>
-      <H3><A name="always"></A>Character Classes that are Always Supported</H3>
-      <P>The following character class names are always supported by Boost.Regex:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Name</STRONG></TD>
-               <TD><STRONG>POSIX-standard name</STRONG></TD>
-               <TD><STRONG>Description</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>alnum</TD>
-               <TD>Yes</TD>
-               <TD>Any alpha-numeric character.</TD>
-            </TR>
-            <TR>
-               <TD>alpha</TD>
-               <TD>Yes</TD>
-               <TD>Any alphabetic character.</TD>
-            </TR>
-            <TR>
-               <TD>blank</TD>
-               <TD>Yes</TD>
-               <TD>Any whitespace character that is not a line separator.</TD>
-            </TR>
-            <TR>
-               <TD>cntrl</TD>
-               <TD>Yes</TD>
-               <TD>Any control character.</TD>
-            </TR>
-            <TR>
-               <TD>d</TD>
-               <TD>No</TD>
-               <TD>Any decimal digit</TD>
-            </TR>
-            <TR>
-               <TD>digit</TD>
-               <TD>Yes</TD>
-               <TD>Any decimal digit.</TD>
-            </TR>
-            <TR>
-               <TD>graph</TD>
-               <TD>Yes</TD>
-               <TD>Any graphical character.</TD>
-            </TR>
-            <TR>
-               <TD>l</TD>
-               <TD>No</TD>
-               <TD>Any lower case character.</TD>
-            </TR>
-            <TR>
-               <TD>lower</TD>
-               <TD>Yes</TD>
-               <TD>Any lower case character.</TD>
-            </TR>
-            <TR>
-               <TD>print</TD>
-               <TD>Yes</TD>
-               <TD>Any printable character.</TD>
-            </TR>
-            <TR>
-               <TD>punct</TD>
-               <TD>Yes</TD>
-               <TD>Any punctuation character.</TD>
-            </TR>
-            <TR>
-               <TD>s</TD>
-               <TD>No</TD>
-               <TD>Any whitespace character.</TD>
-            </TR>
-            <TR>
-               <TD>space</TD>
-               <TD>Yes</TD>
-               <TD>Any whitespace character.</TD>
-            </TR>
-            <TR>
-               <TD>unicode</TD>
-               <TD>No</TD>
-               <TD>Any extended character whose code point is above 255 in value.</TD>
-            </TR>
-            <TR>
-               <TD>u</TD>
-               <TD>No</TD>
-               <TD>Any upper case character.</TD>
-            </TR>
-            <TR>
-               <TD>upper</TD>
-               <TD>Yes</TD>
-               <TD>Any upper case character.</TD>
-            </TR>
-            <TR>
-               <TD>w</TD>
-               <TD>No</TD>
-               <TD>Any word character (alphanumeric characters plus the underscore).</TD>
-            </TR>
-            <TR>
-               <TD>word</TD>
-               <TD>No</TD>
-               <TD>Any word character (alphanumeric characters plus the underscore).</TD>
-            </TR>
-            <TR>
-               <TD>xdigit</TD>
-               <TD>Yes</TD>
-               <TD>Any hexadecimal digit character.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <H3><A name="unicode"></A>Character classes that are supported by Unicode Regular 
-            Expressions</H3>
-      <P>The following character classes are only supported by <A href="icu_strings.html">Unicode 
-            Regular Expressions</A>: that is those that use the u32regex type.&nbsp; The 
-         names used are the same as those from <A href="http://www.unicode.org/versions/Unicode4.0.0/ch04.pdf#G124142">
-            Chapter 4 of the Unicode standard</A>.</P>
-      <table width="100%" ID="Table3">
-         <tr>
-            <td><b>Short Name</b></td>
-            <td><b>Long Name</b></td>
-         </tr>
-         <tr>
-            <td>
-            </td>
-            <td>ASCII</td>
-         </tr>
-         <tr>
-            <td>
-            </td>
-            <td>Any</td>
-         </tr>
-         <tr>
-            <td>
-            </td>
-            <td>Assigned</td>
-         </tr>
-         <tr>
-            <td>C*</td>
-            <td>Other</td>
-         </tr>
-         <tr>
-            <td>Cc</td>
-            <td>Control</td>
-         </tr>
-         <tr>
-            <td>Cf</td>
-            <td>Format</td>
-         </tr>
-         <tr>
-            <td>Cn</td>
-            <td>Not Assigned</td>
-         </tr>
-         <tr>
-            <td>Co</td>
-            <td>Private Use</td>
-         </tr>
-         <tr>
-            <td>Cs</td>
-            <td>Surrogate</td>
-         </tr>
-         <tr>
-            <td>L*</td>
-            <td>Letter</td>
-         </tr>
-         <tr>
-            <td>Ll</td>
-            <td>Lowercase Letter</td>
-         </tr>
-         <tr>
-            <td>Lm</td>
-            <td>Modifier Letter</td>
-         </tr>
-         <tr>
-            <td>Lo</td>
-            <td>Other Letter</td>
-         </tr>
-         <tr>
-            <td>Lt</td>
-            <td>Titlecase</td>
-         </tr>
-         <tr>
-            <td>Lu</td>
-            <td>Uppercase Letter</td>
-         </tr>
-         <tr>
-            <td>M*</td>
-            <td>Mark</td>
-         </tr>
-         <tr>
-            <td>Mc</td>
-            <td>Spacing Combining Mark</td>
-         </tr>
-         <tr>
-            <td>Me</td>
-            <td>Enclosing Mark</td>
-         </tr>
-         <tr>
-            <td>Mn</td>
-            <td>Non-Spacing Mark</td>
-         </tr>
-         <tr>
-            <td>N*</td>
-            <td>Number</td>
-         </tr>
-         <tr>
-            <td>Nd</td>
-            <td>Decimal Digit Number</td>
-         </tr>
-         <tr>
-            <td>Nl</td>
-            <td>Letter Number</td>
-         </tr>
-         <tr>
-            <td>No</td>
-            <td>Other Number</td>
-         </tr>
-         <tr>
-            <td>P*</td>
-            <td>Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pc</td>
-            <td>Connector Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pd</td>
-            <td>Dash Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pe</td>
-            <td>Close Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pf</td>
-            <td>Final Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pi</td>
-            <td>Initial Punctuation</td>
-         </tr>
-         <tr>
-            <td>Po</td>
-            <td>Other Punctuation</td>
-         </tr>
-         <tr>
-            <td>Ps</td>
-            <td>Open Punctuation</td>
-         </tr>
-         <tr>
-            <td>S*</td>
-            <td>Symbol</td>
-         </tr>
-         <tr>
-            <td>Sc</td>
-            <td>Currency Symbol</td>
-         </tr>
-         <tr>
-            <td>Sk</td>
-            <td>Modifier Symbol</td>
-         </tr>
-         <tr>
-            <td>Sm</td>
-            <td>Math Symbol</td>
-         </tr>
-         <tr>
-            <td>So</td>
-            <td>Other Symbol</td>
-         </tr>
-         <tr>
-            <td>Z*</td>
-            <td>Separator</td>
-         </tr>
-         <tr>
-            <td>Zl</td>
-            <td>Line Separator</td>
-         </tr>
-         <tr>
-            <td>Zp</td>
-            <td>Paragraph Separator</td>
-         </tr>
-         <tr>
-            <td>Zs</td>
-            <td>Space Separator</td>
-         </tr>
-      </table>
-      <HR>
-      <P></P>
-      <P></P>
-      <p>Revised&nbsp;&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         10&nbsp;Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004-5</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/collating_names.html b/doc/Attic/collating_names.html
deleted file mode 100644
index c553f1ed..00000000
--- a/doc/Attic/collating_names.html
+++ /dev/null
@@ -1,368 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Collating Element Names</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Collating Element Names</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#digraphs">Digraphs</A></dt>
-         <dt><A href="#posix">POSIX Symbolic Names</A></dt>
-         <dt><A href="#unicode">Unicode Symbolic Names</A></dt>
-      </dl>
-      <H3><A name="digraphs"></A>Digraphs</H3>
-      <P>The following are treated as valid digraphs when used as a collating name:</P>
-      <P>"ae", "Ae", "AE", "ch", "Ch", "CH", "ll", "Ll", "LL", "ss", "Ss", "SS", "nj", 
-         "Nj", "NJ", "dz", "Dz", "DZ", "lj", "Lj", "LJ".</P>
-      <H3><A name="posix"></A>POSIX Symbolic Names</H3>
-      <P>The following symbolic names are recognised as valid collating element names, 
-         in addition to any single character:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="50%" border="1">
-            <TR>
-               <TD><STRONG>Name</STRONG></TD>
-               <TD><STRONG>Character</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>NUL</TD>
-               <TD>\x00</TD>
-            </TR>
-            <TR>
-               <TD>SOH</TD>
-               <TD>\x01</TD>
-            </TR>
-            <TR>
-               <TD>STX</TD>
-               <TD>\x02</TD>
-            </TR>
-            <TR>
-               <TD>ETX</TD>
-               <TD>\x03</TD>
-            </TR>
-            <TR>
-               <TD>EOT</TD>
-               <TD>\x04</TD>
-            </TR>
-            <TR>
-               <TD>ENQ</TD>
-               <TD>\x05</TD>
-            </TR>
-            <TR>
-               <TD>ACK</TD>
-               <TD>\x06</TD>
-            </TR>
-            <TR>
-               <TD>alert</TD>
-               <TD>\x07</TD>
-            </TR>
-            <TR>
-               <TD>backspace</TD>
-               <TD>\x08</TD>
-            </TR>
-            <TR>
-               <TD>tab</TD>
-               <TD>\t</TD>
-            </TR>
-            <TR>
-               <TD>newline</TD>
-               <TD>\n</TD>
-            </TR>
-            <TR>
-               <TD>vertical-tab</TD>
-               <TD>\v</TD>
-            </TR>
-            <TR>
-               <TD>form-feed</TD>
-               <TD>\f</TD>
-            </TR>
-            <TR>
-               <TD>carriage-return</TD>
-               <TD>\r</TD>
-            </TR>
-            <TR>
-               <TD>SO</TD>
-               <TD>\xE</TD>
-            </TR>
-            <TR>
-               <TD>SI</TD>
-               <TD>\xF</TD>
-            </TR>
-            <TR>
-               <TD>DLE</TD>
-               <TD>\x10</TD>
-            </TR>
-            <TR>
-               <TD>DC1</TD>
-               <TD>\x11</TD>
-            </TR>
-            <TR>
-               <TD>DC2</TD>
-               <TD>\x12</TD>
-            </TR>
-            <TR>
-               <TD>DC3</TD>
-               <TD>\x13</TD>
-            </TR>
-            <TR>
-               <TD>DC4</TD>
-               <TD>\x14</TD>
-            </TR>
-            <TR>
-               <TD>NAK</TD>
-               <TD>\x15</TD>
-            </TR>
-            <TR>
-               <TD>SYN</TD>
-               <TD>\x16</TD>
-            </TR>
-            <TR>
-               <TD>ETB</TD>
-               <TD>\x17</TD>
-            </TR>
-            <TR>
-               <TD>CAN</TD>
-               <TD>\x18</TD>
-            </TR>
-            <TR>
-               <TD>EM</TD>
-               <TD>\x19</TD>
-            </TR>
-            <TR>
-               <TD>SUB</TD>
-               <TD>\x1A</TD>
-            </TR>
-            <TR>
-               <TD>ESC</TD>
-               <TD>\x1B</TD>
-            </TR>
-            <TR>
-               <TD>IS4</TD>
-               <TD>\x1C</TD>
-            </TR>
-            <TR>
-               <TD>IS3</TD>
-               <TD>\x1D</TD>
-            </TR>
-            <TR>
-               <TD>IS2</TD>
-               <TD>\x1E</TD>
-            </TR>
-            <TR>
-               <TD>IS1</TD>
-               <TD>\x1F</TD>
-            </TR>
-            <TR>
-               <TD>space</TD>
-               <TD>\x20</TD>
-            </TR>
-            <TR>
-               <TD>exclamation-mark</TD>
-               <TD>!</TD>
-            </TR>
-            <TR>
-               <TD>quotation-mark</TD>
-               <TD>"</TD>
-            </TR>
-            <TR>
-               <TD>number-sign</TD>
-               <TD>#</TD>
-            </TR>
-            <TR>
-               <TD>dollar-sign</TD>
-               <TD>$</TD>
-            </TR>
-            <TR>
-               <TD>percent-sign</TD>
-               <TD>%</TD>
-            </TR>
-            <TR>
-               <TD>ampersand</TD>
-               <TD>&amp;</TD>
-            </TR>
-            <TR>
-               <TD>apostrophe</TD>
-               <TD>'</TD>
-            </TR>
-            <TR>
-               <TD>left-parenthesis</TD>
-               <TD>(</TD>
-            </TR>
-            <TR>
-               <TD>right-parenthesis</TD>
-               <TD>)</TD>
-            </TR>
-            <TR>
-               <TD>asterisk</TD>
-               <TD>*</TD>
-            </TR>
-            <TR>
-               <TD>plus-sign</TD>
-               <TD>+</TD>
-            </TR>
-            <TR>
-               <TD>comma</TD>
-               <TD>,</TD>
-            </TR>
-            <TR>
-               <TD>hyphen</TD>
-               <TD>-</TD>
-            </TR>
-            <TR>
-               <TD>period</TD>
-               <TD>.</TD>
-            </TR>
-            <TR>
-               <TD>slash</TD>
-               <TD>/</TD>
-            </TR>
-            <TR>
-               <TD>zero</TD>
-               <TD>0</TD>
-            </TR>
-            <TR>
-               <TD>one</TD>
-               <TD>1</TD>
-            </TR>
-            <TR>
-               <TD>two</TD>
-               <TD>2</TD>
-            </TR>
-            <TR>
-               <TD>three</TD>
-               <TD>3</TD>
-            </TR>
-            <TR>
-               <TD>four</TD>
-               <TD>4</TD>
-            </TR>
-            <TR>
-               <TD>five</TD>
-               <TD>5</TD>
-            </TR>
-            <TR>
-               <TD>six</TD>
-               <TD>6</TD>
-            </TR>
-            <TR>
-               <TD>seven</TD>
-               <TD>7</TD>
-            </TR>
-            <TR>
-               <TD>eight</TD>
-               <TD>8</TD>
-            </TR>
-            <TR>
-               <TD>nine</TD>
-               <TD>9</TD>
-            </TR>
-            <TR>
-               <TD>colon</TD>
-               <TD>:</TD>
-            </TR>
-            <TR>
-               <TD>semicolon</TD>
-               <TD>;</TD>
-            </TR>
-            <TR>
-               <TD>less-than-sign</TD>
-               <TD>&lt;</TD>
-            </TR>
-            <TR>
-               <TD>equals-sign</TD>
-               <TD>=</TD>
-            </TR>
-            <TR>
-               <TD>greater-than-sign</TD>
-               <TD>&gt;</TD>
-            </TR>
-            <TR>
-               <TD>question-mark</TD>
-               <TD>?</TD>
-            </TR>
-            <TR>
-               <TD>commercial-at</TD>
-               <TD>@</TD>
-            </TR>
-            <TR>
-               <TD>left-square-bracket</TD>
-               <TD>[</TD>
-            </TR>
-            <TR>
-               <TD>backslash</TD>
-               <TD>\</TD>
-            </TR>
-            <TR>
-               <TD>right-square-bracket</TD>
-               <TD>]</TD>
-            </TR>
-            <TR>
-               <TD>circumflex</TD>
-               <TD>~</TD>
-            </TR>
-            <TR>
-               <TD>underscore</TD>
-               <TD>_</TD>
-            </TR>
-            <TR>
-               <TD>grave-accent</TD>
-               <TD>`</TD>
-            </TR>
-            <TR>
-               <TD>left-curly-bracket</TD>
-               <TD>{</TD>
-            </TR>
-            <TR>
-               <TD>vertical-line</TD>
-               <TD>|</TD>
-            </TR>
-            <TR>
-               <TD>right-curly-bracket</TD>
-               <TD>}</TD>
-            </TR>
-            <TR>
-               <TD>tilde</TD>
-               <TD>~</TD>
-            </TR>
-            <TR>
-               <TD>DEL</TD>
-               <TD>\x7F</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <H3><A name="unicode"></A>Named Unicode Characters</H3>
-      <P>When using <A href="icu_strings.html">Unicode aware regular expressions</A> (with 
-         the <EM>u32regex </EM>type), all the normal symbolic names for Unicode 
-         characters (those given in Unidata.txt) are recognised.</P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised 12 Jan 2005 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004-2005</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/concepts.html b/doc/Attic/concepts.html
deleted file mode 100644
index ed598933..00000000
--- a/doc/Attic/concepts.html
+++ /dev/null
@@ -1,453 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Index</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Concepts</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3><A name="charT"></A>charT requirements</H3>
-      <P>Type charT used a template argument to <A href="basic_regex.html">class template 
-            basic_regex</A>, must have a trivial default constructor, copy constructor, 
-         assignment operator, and destructor.&nbsp; In addition the following 
-         requirements must be met for objects; c of type charT, c1 and c2 of type charT 
-         const, and i of type int:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Expression</STRONG></TD>
-               <TD><STRONG>Return type</STRONG></TD>
-               <TD><STRONG>Assertion / Note / Pre- / Post-condition</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>charT c</TD>
-               <TD>charT</TD>
-               <TD>Default constructor (must be trivial).</TD>
-            </TR>
-            <TR>
-               <TD>charT c(c1)</TD>
-               <TD>charT</TD>
-               <TD>Copy constructor (must be trivial).</TD>
-            </TR>
-            <TR>
-               <TD>c1 = c2</TD>
-               <TD>charT</TD>
-               <TD>Assignment operator (must be trivial).</TD>
-            </TR>
-            <TR>
-               <TD>c1 == c2</TD>
-               <TD>bool</TD>
-               <TD>true if&nbsp;c1 has the same value&nbsp;as c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 != c2</TD>
-               <TD>bool</TD>
-               <TD>true if c1 and c2 are not equal.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &lt; c2</TD>
-               <TD>bool</TD>
-               <TD>true if the value of c1 is less than c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &gt; c2</TD>
-               <TD>bool</TD>
-               <TD>true if the value of c1 is greater than c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &lt;= c2</TD>
-               <TD>bool</TD>
-               <TD>true if c1 is less than or equal to c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &gt;= c2</TD>
-               <TD>bool</TD>
-               <TD>true if c1 is greater than or equal to c2.</TD>
-            </TR>
-            <TR>
-               <TD>intmax_t i = c1</TD>
-               <TD>int</TD>
-               <TD>
-                  <P>charT must be convertible to an integral type.</P>
-                  <P>Note: type charT is not required to support this operation, if the traits class 
-                     used supports the full Boost-specific interface, rather than&nbsp;the minimal 
-                     standardised-interface (see traits class requirements below).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>charT c(i);</TD>
-               <TD>charT</TD>
-               <TD>charT must be constructable from an integral type.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="traits"></A>traits requirements</H3>
-      <P>There are two sets of requirements for the traits template argument to 
-         basic_regex: a mininal interface (which is part of the regex standardization 
-         proposal), and an optional Boost-specific enhanced interface.</P>
-      <H4>Minimal requirements.</H4>
-      <P>In the following table X denotes a traits class defining types and functions 
-         for the character container type charT; u is an object of type X; v is an 
-         object of type const X; p is a value of type const charT*; I1 and I2 are Input 
-         Iterators; c is a value of type const charT; s is an object of type 
-         X::string_type; cs is an object of type const X::string_type; b is a value of 
-         type bool; I is a value of type int; F1 and F2 are values of type const charT*; 
-         and loc is an object of type X::locale_type.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="1" cellPadding="7" width="100%" border="1">
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P><STRONG>Expression</STRONG></P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P><STRONG>Return type</STRONG></P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P><STRONG>Assertion / Note
-                        <BR>
-                        Pre / Post condition</STRONG></P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>charT</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>The character container type used in the implementation of class template <CODE>basic_regex</CODE>.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::size_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>&nbsp;</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>An unsigned integer type, capable of holding the length of a null-terminated 
-                     string of charT's.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>std::basic_string&lt;charT&gt; or std::vector&lt;charT&gt;</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::locale_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>Implementation defined</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>A copy constructible type that represents the locale used by the traits class.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_class_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>Implementation defined</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>A bitmask type representing a particular character classification. Multiple 
-                     values of this type can be bitwise-or'ed together to obtain a new valid value.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::length(p)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::size_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Yields the smallest <CODE>i</CODE> such that <CODE>p[i] == 0</CODE>. Complexity 
-                     is linear in <CODE>i</CODE>.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.translate(c)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a character such that for any character d that is to be considered 
-                     equivalent to c then v.translate(c) == v.translate(d).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.translate_nocase(c)</P>
-               </TD>
-               <TD vAlign="top" width="28%">X::char_type</TD>
-               <TD vAlign="top" width="45%">For all characters C that are to be considered 
-                  equivalent to c when comparisons are to be performed without regard to case, 
-                  then v.translate_- nocase(c) == v.translate_- nocase(C).</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.transform(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a sort key for the character sequence designated by the iterator range 
-                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
-                     character sequence [H1, H2) then v.transform(G1, G2) &lt; v.transform(H1, 
-                     H2).&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.transform_primary(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a sort key for the character sequence designated by the iterator range 
-                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
-                     character sequence [H1, H2) when character case is not considered then 
-                     v.transform_primary(G1, G2) &lt; v.transform_- primary(H1, H2).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.lookup_classname(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_class_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Converts the character sequence designated by the iterator range [F1,F2) into a 
-                     bitmask type that can subsequently be passed to isctype. Values returned from 
-                     lookup_classname can be safely bitwise or'ed together. Returns 0 if the 
-                     character sequence is not the name of a character class recognized by X. The 
-                     value returned shall be independent of the case of the characters in the 
-                     sequence.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.lookup_collatename(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a sequence of characters that represents the collating element 
-                     consisting of the character sequence designated by the iterator range [F1, F2). 
-                     Returns an empty string if the character sequence is not a valid collating 
-                     element.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.isctype(c, v.lookup_classname (F1, F2))</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>bool</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns true if character c is a member of the character class designated by 
-                     the iterator range [F1, F2), false otherwise.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.value(c, i)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>int</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns the value represented by the digit c in base I if the character c is a 
-                     valid digit in base I; otherwise returns -1. [Note: the value of I will only be 
-                     8, 10, or 16. -end note]</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>u.imbue(loc)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::locale_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Imbues <CODE>u</CODE> with the locale <CODE>loc</CODE>, returns the previous 
-                     locale used by u if any.&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.getloc()</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::locale_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns the current locale used by <CODE>v</CODE> if any.&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.error_string(i)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>std::string</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
-                     where <CODE>i</CODE> is one of the values enumerated by type <CODE>regex_constants::error_type</CODE>.&nbsp; 
-                     If the value <CODE>i</CODE> is not recognized then returns the string "Unknown 
-                     error" or a localized equivalent.</P>
-               </TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4>Additional Optional Requirements</H4>
-      <P>The following additional requirements are strictly optional, however in order 
-         for basic_regex to take advantage of these additional interfaces, all of the 
-         following requirements must be met; basic_regex will detect the presence or 
-         absense of member <EM>boost_extensions_tag </EM>and configure itself 
-         appropriately.</P>
-      <P>
-         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Expression</STRONG></TD>
-               <TD width="231"><STRONG>Result</STRONG></TD>
-               <TD>
-                  <P><STRONG>Assertion / Note
-                        <BR>
-                        Pre / Post condition</STRONG></P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>X::boost_extensions_tag</TD>
-               <TD width="231">An unspecified type.</TD>
-               <TD>When present, all of the extensions listed in this table must be present.</TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.syntax_type(c)</P>
-               </TD>
-               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::syntax_type</A></TD>
-               <TD>
-                  <P>Returns a symbolic value of type <CODE>regex_constants::syntax_type </CODE>that 
-                     signifies the meaning of character <CODE>c</CODE> within the regular expression 
-                     grammar.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>v.escape_syntax_type(c)</TD>
-               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::escape_syntax_type</A></TD>
-               <TD>
-                  <P>Returns a symbolic value of type <CODE>regex_constants::escape_syntax_type</CODE>, 
-                     that signifies the meaning of character <CODE>c</CODE>&nbsp;within the regular 
-                     expression grammar, when <CODE>c</CODE> has been preceded by an escape 
-                     character. Precondition: if <CODE>b</CODE> is the character preceding <CODE>c</CODE>
-                     in the expression being parsed then: <CODE>v.syntax_type(b) == syntax_escape</CODE></P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.translate(c, b)</P>
-               </TD>
-               <TD width="231">X::char_type</TD>
-               <TD>
-                  <P>Returns a character <CODE>d</CODE> such that: for any character <CODE>d</CODE> that 
-                     is to be considered equivalent to <CODE>c</CODE>&nbsp;then <CODE>v.translate(c,false)==v.translate(d,false)</CODE>. 
-                     Likewise for all characters <CODE>C</CODE> that are to be considered equivalent 
-                     to <CODE>c</CODE> when comparisons are to be performed without regard to case, 
-                     then <CODE>v.translate(c,true)==v.translate(C,true)</CODE>.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.toi(I1, I2, i)</P>
-               </TD>
-               <TD width="231">An integer type capable of holding either a charT or an int.</TD>
-               <TD>
-                  <P>Behaves as follows: if <CODE>p==q</CODE> or if <CODE>*p </CODE>is not a digit 
-                     character then returns -1. Otherwise performs formatted numeric input on the 
-                     sequence [p,q) and returns the result as an int. Postcondition: either <CODE>p == 
-                        q</CODE> or <CODE>*p</CODE> is a non-digit character.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.error_string(i)</P>
-               </TD>
-               <TD width="231">std::string</TD>
-               <TD>
-                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
-                     where <CODE>i</CODE> is one of the values enumerated by type <CODE><A href="error_type.html">
-                           regex_constants::error_type</A></CODE>.&nbsp; If the value <CODE>i</CODE> 
-                     is not recognized then returns the string "Unknown error" or a localized 
-                     equivalent.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>v.tolower(c)</TD>
-               <TD width="231">X::char_type</TD>
-               <TD>Converts c to lower case, used for Perl-style \l and \L formating operations.</TD>
-            </TR>
-            <TR>
-               <TD>v.toupper(c)</TD>
-               <TD width="231">X::char_type</TD>
-               <TD>Converts c to upper case, used for Perl-style \u and \U formating operations.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="iterator"></A>Iterator Rrequirements</H3>
-      <P>
-      <P>The regular expression algorithms (and iterators) take all require a 
-         Bidirectional-Iterator.</P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/configuration.html b/doc/Attic/configuration.html
deleted file mode 100644
index 9da777e7..00000000
--- a/doc/Attic/configuration.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Configuration and setup</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Configuration and setup</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h2>Contents</h2>
-      <dl class="index">
-         <dt><a href="#compiler">Compiler setup</a> <dt><a href="#locale">Locale and traits class 
-                  selection</a> <dt><a href="#linkage">Linkage Options</a> <dt><a href="#algorithm">Algorithm 
-                        Selection</a> <dt><a href="#tuning">Algorithm Tuning</a></dt>
-      </dl>
-      <h3><a name="compiler"></a>Compiler setup.</h3>
-      <p>You shouldn't need to do anything special to configure boost.regex for use with 
-         your compiler - the <a href="../../config/index.html">boost.config</a> subsystem 
-         should already take care of it, if you do have problems (or you are using a 
-         particularly obscure compiler or platform) then <a href="../../config/index.html">boost.config</a>&nbsp;has 
-         a&nbsp;<a href="../../config/config.htm#config_script">configure</a> script.</p>
-      <h3><a name="locale"></a>Locale and traits class selection.</h3>
-      <p>The following macros (see <a href="../../../boost/regex/user.hpp">user.hpp</a>) 
-         control how boost.regex interacts with the user's locale:</p>
-      <table id="Table2" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td width="265">BOOST_REGEX_USE_C_LOCALE</td>
-            <td>
-               Forces boost.regex to use the global C locale in its traits class support: this 
-               is now deprecated in favour of the C++ locale.</td>
-         </tr>
-         <tr>
-            <td width="265">BOOST_REGEX_USE_CPP_LOCALE</td>
-            <td>Forces boost.regex to use std::locale in it's default traits class, regular 
-               expressions can then be imbued with an instance&nbsp;specific locale.&nbsp; 
-               This is the default behaviour on non-Windows platforms.</td>
-         </tr>
-         <tr>
-            <td width="265">BOOST_REGEX_NO_W32</td>
-            <td>Tells boost.regex not to use any Win32 API's even when available (implies 
-               BOOST_REGEX_USE_CPP_LOCALE unless BOOST_REGEX_USE_C_LOCALE is set).</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3><a name="linkage"></a>Linkage Options</h3>
-      <table id="Table3" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td>BOOST_REGEX_DYN_LINK</td>
-            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
-               link to the dll build of the boost.regex.&nbsp; By default boost.regex will 
-               link to its static library build, even if the dynamic C runtime library is in 
-               use.</td>
-         </tr>
-         <tr>
-            <td>BOOST_REGEX_NO_LIB</td>
-            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
-               not automatically select the library to link to.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3><a name="algorithm"></a>Algorithm Selection</h3>
-      <table id="Table4" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td width="253">BOOST_REGEX_RECURSIVE</td>
-            <td>Tells boost.regex to use a stack-recursive matching algorithm.&nbsp; This is 
-               generally the fastest option (although there is very little in it), but can 
-               cause stack overflow in extreme cases, on Win32 this can be handled safely, but 
-               this is not the case on other platforms.</td>
-         </tr>
-         <tr>
-            <td width="253">BOOST_REGEX_NON_RECURSIVE</td>
-            <td>Tells boost.regex to use a non-stack recursive matching algorithm, this can be 
-               slightly slower than the alternative, but is always safe no matter how 
-               pathological the regular expression.&nbsp; This is the default on non-Win32 
-               platforms.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3><a name="tuning"></a>Algorithm Tuning</h3>
-      <p>The following option applies only if BOOST_REGEX_RECURSIVE is set.</p>
-      <table id="Table6" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td>BOOST_REGEX_HAS_MS_STACK_GUARD</td>
-            <td>Tells boost.regex that Microsoft style __try - __except blocks are supported, 
-               and can be used to safely trap stack overflow.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>The following options apply only if BOOST_REGEX_NON_RECURSIVE is set.</p>
-      <table id="Table5" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td>BOOST_REGEX_BLOCKSIZE</td>
-            <td>In non-recursive mode, boost.regex uses largish blocks of memory to act as a 
-               stack for the state machine, the larger the block size then the fewer 
-               allocations that will take place.&nbsp; This defaults to 4096 bytes, which is 
-               large enough to match the vast majority of regular expressions&nbsp;without 
-               further allocations, however, you can choose smaller or larger values depending 
-               upon your platforms characteristics.</td>
-         </tr>
-         <tr>
-            <td>BOOST_REGEX_MAX_BLOCKS</td>
-            <td>Tells boost.regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is 
-               permitted to use.&nbsp; If this value is exceeded then boost.regex will stop 
-               trying to find a match and throw a std::runtime_error.&nbsp; Defaults to 1024, 
-               don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE by much.</td>
-         </tr>
-         <tr>
-            <td>BOOST_REGEX_MAX_CACHE_BLOCKS</td>
-            <td>Tells boost.regex how many memory blocks to store in it's internal cache - 
-               memory blocks are taken from this cache rather than by calling ::operator 
-               new.&nbsp; Generally speeking this can be an order of magnitude faster than 
-               calling ::opertator new each time a memory block is required, but has the 
-               downside that boost.regex can end up caching a large chunk of memory (by 
-               default up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size).&nbsp; If memory is 
-               tight then try defining this to 0 (disables all caching), or if that is too 
-               slow, then a value of 1 or 2, may be sufficient.&nbsp; On the other hand, on 
-               large multi-processor, multi-threaded systems, you may find that a higher value 
-               is in order.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         23 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/contacts.html b/doc/Attic/contacts.html
deleted file mode 100644
index 645460ec..00000000
--- a/doc/Attic/contacts.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Contacts</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Contacts and Acknowledgements</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <BR>
-      <BR>
-      <HR>
-      <P>The author can be contacted at john@johnmaddock.co.uk;&nbsp;the home page for 
-         this library is at <A href="http://www.boost.org">www.boost.org</A>.</P>
-      <P>I am indebted to <A href="http://www.cs.princeton.edu/~rs/">Robert Sedgewick's 
-            "Algorithms in C++" </A>for forcing me to think about algorithms and their 
-         performance, and to the folks at <A href="http://www.boost.org">boost</A> for 
-         forcing me to <I>think</I>, period.</P>
-      <P><A href="http://www.boost-consulting.com">Eric Niebler</A>, author of the <A href="http://research.microsoft.com/projects/greta">
-            GRETA regular expression component</A>, has shared several important ideas, 
-         in a series of long discussions.</P>
-      <P>Pete Becker, of <A href="http://www.dinkumware.com/">Dinkumware Ltd</A>, has 
-         helped enormously with the standardisation proposal language.</P>
-      <P>The following people have all contributed useful comments or fixes: Dave 
-         Abrahams, Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan Bölsche, 
-         Beman Dawes, Paul Baxter, David Bergman, David Dennerline, Edward Diener, Peter 
-         Dimov, Robert Dunn, Fabio Forno, Tobias Gabrielsson, Rob Gillen, Marc Gregoire, 
-         Chris Hecker, Nick Hodapp, Jesse Jones, Martin Jost, Boris Krasnovskiy, Jan 
-         Hermelink, Max Leung, Wei-hao Lin, Jens Maurer, Richard Peters, Heiko Schmidt, 
-         Jason Shirk, Gerald Slacik, Scobie Smith, Mike Smyth, Alexander Sokolovsky, 
-         Hervé Poirier, Michael Raykh, Marc Recht, Scott VanCamp, Bruno Voigt, Alexey 
-         Voinov, Jerry Waldorf, Rob Ward, Lealon Watts, John Wismar, Thomas Witt and 
-         Yuval Yosef. I am also grateful to the manuals supplied with the Henry Spencer, 
-         Perl and GNU regular expression libraries - wherever possible I have tried to 
-         maintain compatibility with these libraries and with the POSIX standard - the 
-         code however is entirely my own, including any bugs! I can absolutely guarantee 
-         that I will not fix any bugs I don't know about, so if you have any comments or 
-         spot any bugs, please get in touch.</P>
-      <P>Useful further information can be found at:</P>
-      <P>Short&nbsp;tutorials on regular expressions can be <A href="http://etext.lib.virginia.edu/helpsheets/regex.html">
-            found here</A> and&nbsp;<A href="http://www.linuxpcug.org/lessons/regexp.html">here</A>.</P>
-      <P>The main book on regular expressions is <A href="http://www.oreilly.com/catalog/regex/">
-            Mastering Regular Expressions, published by O'Reilly</A>.</P>
-      <P>Information on the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            Boost.regex standardization proposal</A>, along with other <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1475.html">
-            standard library extension proposals</A> can be found on the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/">
-            C++ Committees web pages</A>.</P>
-      <P>The<a href="http://www.opengroup.org/onlinepubs/7908799/toc.htm">Open Unix 
-            Specification</a> contains a wealth of useful material, including the 
-         regular expression syntax, and specifications for <a href="http://www.opengroup.org/onlinepubs/7908799/xsh/regex.h.html">
-            &lt;regex.h&gt;</a> and <a href="http://www.opengroup.org/onlinepubs/7908799/xsh/nl_types.h.html">
-            &lt;nl_types.h&gt;</a>.</P>
-      <p>The <a href="http://www.cs.ucr.edu/~stelo/pattern.html">Pattern Matching Pointers</a>
-         site is a "must visit" resource for anyone interested in pattern matching.</p>
-      <p><a href="http://glimpse.cs.arizona.edu/">Glimpse and Agrep</a>, use a 
-         simplified regular expression syntax to achieve faster search times.</p>
-      <p><a href="http://glimpse.cs.arizona.edu/udi.html">Udi Manber</a> and <a href="http://www.dcc.uchile.cl/~rbaeza/">
-            Ricardo Baeza-Yates</a> both have a selection of useful pattern matching 
-         papers available from their respective web sites.</p>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/error_type.html b/doc/Attic/error_type.html
deleted file mode 100644
index 6ca14383..00000000
--- a/doc/Attic/error_type.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: error_type</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">error_type</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>Type error type represents the different types of errors that can be raised by 
-         the library when parsing a regular expression.</P>
-      <pre>
-namespace boost{ namespace regex_constants{
-
-typedef implementation-specific-type error_type;
-
-static const error_type error_collate;
-static const error_type error_ctype;
-static const error_type error_escape;
-static const error_type error_backref;
-static const error_type error_brack;
-static const error_type error_paren;
-static const error_type error_brace;
-static const error_type error_badbrace;
-static const error_type error_range;
-static const error_type error_space;
-static const error_type error_badrepeat;
-static const error_type error_complexity;
-static const error_type error_stack;
-static const error_type error_bad_pattern;
-
-} // namespace regex_constants
-} // namespace boost
-</pre>
-      <P>&nbsp;</P>
-      <H3><A name="description"></A>Description</H3>
-      <P>The type error_type is an implementation-specific enumeration type that may 
-         take one of the following values:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Constant</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>error_collate</TD>
-               <TD>An invalid collating element was specified in a [[.name.]] block.</TD>
-            </TR>
-            <TR>
-               <TD>error_ctype</TD>
-               <TD>An invalid character class name was specified in a [[:name:]] block.</TD>
-            </TR>
-            <TR>
-               <TD>error_escape</TD>
-               <TD>An invalid or trailing escape was encountered.</TD>
-            </TR>
-            <TR>
-               <TD>error_backref</TD>
-               <TD>A back-reference to a non-existant marked sub-expression was encountered.</TD>
-            </TR>
-            <TR>
-               <TD>error_brack</TD>
-               <TD>An invalid character set [...] was encountered.</TD>
-            </TR>
-            <TR>
-               <TD>error_paren</TD>
-               <TD>
-                  <P>Mismatched '(' and ')'.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>error_brace</TD>
-               <TD>Mismatched '{' and '}'.</TD>
-            </TR>
-            <TR>
-               <TD>error_badbrace</TD>
-               <TD>Invalid contents of a {...} block.</TD>
-            </TR>
-            <TR>
-               <TD>error_range</TD>
-               <TD>A character range was invalid, for example [d-a].</TD>
-            </TR>
-            <TR>
-               <TD>error_space</TD>
-               <TD>Out of memory.</TD>
-            </TR>
-            <TR>
-               <TD>error_badrepeat</TD>
-               <TD>An attempt to repeat something that can not be repeated - for example a*+</TD>
-            </TR>
-            <TR>
-               <TD>error_complexity</TD>
-               <TD>The expression became too complex to handle.</TD>
-            </TR>
-            <TR>
-               <TD>error_stack</TD>
-               <TD>Out of program stack space.</TD>
-            </TR>
-            <TR>
-               <TD>error_bad_pattern</TD>
-               <TD>Other unspecified errors.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="examples"></A>
-         <HR>
-      </H3>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-      </p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/examples.html b/doc/Attic/examples.html
deleted file mode 100644
index 737b11ee..00000000
--- a/doc/Attic/examples.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Examples</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Examples</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <BR>
-      <BR>
-      <HR>
-      <H3>Test Programs</H3>
-      <H4>regress:</H4>
-      <P>A regression test application that gives the matching/searching algorithms a 
-         full workout. The presence of this program is your guarantee that the library 
-         will behave as claimed - at least as far as those items tested are concerned - 
-         if anyone spots anything that isn't being tested I'd be glad to hear about it.</P>
-      <P>Directory: <A href="../test/regress">libs/regex/test/regress</A>.</P>
-      <P>Files: <A href="../test/regress/basic_tests.cpp">basic_tests.cpp</A> <A href="../test/regress/test_deprecated.cpp">
-            test_deprecated.cpp</A> <A href="../test/regress/main.cpp">main.cpp</A>.</P>
-      <H4>bad_expression_test:</H4>
-      <P>Verifies that "bad" regular expressions don't cause the matcher to go into 
-         infinite loops, but to throw an exception instead.</P>
-      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
-      <P>Files: <A href="../test/pathology/bad_expression_test.cpp">bad_expression_test.cpp</A>.</P>
-      <H4>recursion_test:</H4>
-      <P>Verifies that the matcher can't overrun the stack (no matter what the 
-         expression).</P>
-      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
-      <P>Files: <A href="../test/pathology/recursion_test.cpp">recursion_test.cpp</A>.</P>
-      <H4>concepts:</H4>
-      <P>Verifies that the library meets all documented concepts (a compile only test).</P>
-      <P>Directory: <A href="../test/concepts">libs/regex/test/concepts</A>.</P>
-      <P>Files: <A href="../test/concepts/concept_check.cpp">concept_check.cpp</A>.</P>
-      <H4>captures_test:</H4>
-      <P>Test code for captures.</P>
-      <P>Directory: <A href="../test/captures">libs/test/captures</A>.</P>
-      <P>Files: <A href="../test/captures/captures_test.cpp">captures_test.cpp</A>.</P>
-      <H3>Example programs</H3>
-      <H4>grep</H4>
-      <P>A simple grep implementation, run with the -h command line option to find out 
-         its usage.</P>
-      <P>Files: <A href="../example/grep/grep.cpp">grep.cpp</A></P>
-      <H4>timer.exe</H4>
-      <P>A simple interactive expression matching application, the results of all 
-         matches are timed, allowing the programmer to optimize their regular 
-         expressions where performance is critical.</P>
-      <P>Files: <A href="../example/timer/regex_timer.cpp">regex_timer.cpp</A>.</P>
-      <H4>Code snippets</H4>
-      <P>The snippets examples contain the code examples used in the documentation:</P>
-      <P><A href="../example/snippets/captures_example.cpp">captures_example.cpp</A>: 
-         Demonstrates the use of captures.</P>
-      <P><A href="../example/snippets/credit_card_example.cpp">credit_card_example.cpp</A>: 
-         Credit card number formatting code.</P>
-      <P><A href="../example/snippets/partial_regex_grep.cpp">partial_regex_grep.cpp</A>: 
-         Search example using partial matches.</P>
-      <P><A href="../example/snippets/partial_regex_match.cpp">partial_regex_match.cpp</A>: 
-         regex_match example using partial matches.</P>
-      <P><A href="../example/snippets/regex_iterator_example.cpp">regex_iterator_example.cpp</A>: 
-         Iterating through a series of matches.</P>
-      <P><A href="../example/snippets/regex_match_example.cpp">regex_match_example.cpp</A>: 
-         ftp based regex_match example.</P>
-      <P><A href="../example/snippets/regex_merge_example.cpp">regex_merge_example.cpp</A>: 
-         regex_merge example: converts a C++ file to syntax highlighted HTML.</P>
-      <P><A href="../example/snippets/regex_replace_example.cpp">regex_replace_example.cpp</A>: 
-         regex_replace example: converts a C++ file to syntax highlighted HTML</P>
-      <P><A href="../example/snippets/regex_search_example.cpp">regex_search_example.cpp</A>: 
-         regex_search example: searches a cpp file for class definitions.</P>
-      <P><A href="../example/snippets/regex_token_iterator_eg_1.cpp">regex_token_iterator_eg_1.cpp</A>: 
-         split a string into a series of tokens.</P>
-      <P><A href="../example/snippets/regex_token_iterator_eg_2.cpp">regex_token_iterator_eg_2.cpp</A>: 
-         enumerate the linked URL's in a HTML file.</P>
-      <P>The following are deprecated:</P>
-      <P><A href="../example/snippets/regex_grep_example_1.cpp">regex_grep_example_1.cpp</A>: 
-         regex_grep example 1: searches a cpp file for class definitions.</P>
-      <P><A href="../example/snippets/regex_grep_example_2.cpp">regex_grep_example_2.cpp</A>: 
-         regex_grep example 2: searches a cpp file for class definitions, using a global 
-         callback function.</P>
-      <P><A href="../example/snippets/regex_grep_example_3.cpp">regex_grep_example_3.cpp</A>: 
-         regex_grep example 2: searches a cpp file for class definitions, using a bound 
-         member function callback.</P>
-      <P><A href="../example/snippets/regex_grep_example_4.cpp">regex_grep_example_4.cpp</A>: 
-         regex_grep example 2: searches a cpp file for class definitions, using a C++ 
-         Builder closure as a callback.</P>
-      <P><A href="../example/snippets/regex_split_example_1.cpp">regex_split_example_1.cpp</A>: 
-         regex_split example: split a string into tokens.</P>
-      <P><A href="../example/snippets/regex_split_example_2.cpp">regex_split_example_2.cpp</A>
-         : regex_split example: spit out linked URL's.</P>
-      <P></P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/faq.html b/doc/Attic/faq.html
deleted file mode 100644
index e9557443..00000000
--- a/doc/Attic/faq.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: FAQ</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">FAQ</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <font color="#ff0000"><font color="#ff0000"></font></font>
-      <p><font color="#ff0000"><font color="#ff0000"><font color="#ff0000">&nbsp;Q. Why can't I 
-                  use the "convenience" versions of regex_match / regex_search / regex_grep / 
-                  regex_format / regex_merge?</font></font></font></p>
-      <p>A. These versions may or may not be available depending upon the capabilities 
-         of your compiler, the rules determining the format of these functions are quite 
-         complex - and only the versions visible to a standard compliant compiler are 
-         given in the help. To find out what your compiler supports, run 
-         &lt;boost/regex.hpp&gt; through your C++ pre-processor, and search the output 
-         file for the function that you are interested in.<font color="#ff0000"><font color="#ff0000"></font></font></p>
-      <p><font color="#ff0000"><font color="#ff0000">Q. I can't get regex++ to work with 
-               escape characters, what's going on?</font></font></p>
-      <p>A. If you embed regular expressions in C++ code, then remember that escape 
-         characters are processed twice: once by the C++ compiler, and once by the 
-         regex++ expression compiler, so to pass the regular expression \d+ to regex++, 
-         you need to embed "\\d+" in your code. Likewise to match a literal backslash 
-         you will need to embed "\\\\" in your code. <font color="#ff0000"></font>
-      </p>
-      <p><font color="#ff0000">Q. Why does using parenthesis in a POSIX regular expression 
-            change the result of a match?</font></p>
-      <p>For POSIX (extended and basic) regular expressions, but not for perl regexes, 
-         parentheses don't only mark; they determine what the best match is as well. 
-         When the expression is compiled as a POSIX basic or extended regex then 
-         Boost.regex follows the POSIX standard leftmost longest rule for determining 
-         what matched. So if there is more than one possible match after considering the 
-         whole expression, it looks next at the first sub-expression and then the second 
-         sub-expression and so on. So...</p>
-      <pre>
-"(0*)([0-9]*)" against "00123" would produce
-$1 = "00"
-$2 = "123"
-</pre>
-      <p>where as</p>
-      <pre>
-"0*([0-9])*" against "00123" would produce
-$1 = "00123"
-</pre>
-      <p>If you think about it, had $1 only matched the "123", this would be "less good" 
-         than the match "00123" which is both further to the left and longer. If you 
-         want $1 to match only the "123" part, then you need to use something like:</p>
-      <pre>
-"0*([1-9][0-9]*)"
-</pre>
-      <p>as the expression.</p>
-      <p><font color="#ff0000">Q. Why don't character ranges work properly (POSIX mode 
-            only)?</font><br>
-         A. The POSIX standard specifies that character range expressions are locale 
-         sensitive - so for example the expression [A-Z] will match any collating 
-         element that collates between 'A' and 'Z'. That means that for most locales 
-         other than "C" or "POSIX", [A-Z] would match the single character 't' for 
-         example, which is not what most people expect - or at least not what most 
-         people have come to expect from regular expression engines. For this reason, 
-         the default behaviour of boost.regex (perl mode) is to turn locale sensitive 
-         collation off by not setting the regex_constants::collate compile time flag. 
-         However if you set a non-default compile time flag - for example 
-         regex_constants::extended or regex_constants::basic, then locale dependent 
-         collation will be enabled, this also applies to the POSIX API functions which 
-         use either regex_constants::extended or regex_constants::basic internally. <i>[Note 
-            - when regex_constants::nocollate in effect, the library behaves "as if" the 
-            LC_COLLATE locale category were always "C", regardless of what its actually set 
-            to - end note</i>].</p>
-      <p><font color="#ff0000">Q. Why are there no throw specifications on any of the 
-            functions? What exceptions can the library throw?</font></p>
-      <p>A. Not all compilers support (or honor) throw specifications, others support 
-         them but with reduced efficiency. Throw specifications may be added at a later 
-         date as compilers begin to handle this better. The library should throw only 
-         three types of exception: boost::bad_expression can be thrown by basic_regex 
-         when compiling a regular expression, std::runtime_error can be thrown when a 
-         call to basic_regex::imbue tries to open a message catalogue that doesn't 
-         exist, or when a call to regex_search or regex_match results in an 
-         "everlasting" search,&nbsp;or when a call to RegEx::GrepFiles or 
-         RegEx::FindFiles tries to open a file that cannot be opened, finally 
-         std::bad_alloc can be thrown by just about any of the functions in this 
-         library.</p>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/format_boost_syntax.html b/doc/Attic/format_boost_syntax.html
deleted file mode 100644
index d497ddeb..00000000
--- a/doc/Attic/format_boost_syntax.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Boost-Extended Format String Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Boost-Extended Format String Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Boost-Extended&nbsp;format strings treat all characters as literals except for 
-         '$', '\', '(', ')', '?', ':' and '\'.</P>
-      <H4>Grouping</H4>
-      <P>The characters '(' and ')' perform lexical grouping, use \( and \) if you want 
-         a to output literal parenthesis.</P>
-      <H4>Conditionals</H4>
-      <P>The character '?' begins a conditional expression, the general form is:</P>
-      <PRE>?Ntrue-expression:false-expression</PRE>
-      <P>where N is decimal digit.</P>
-      <P>If sub-expression <EM>N</EM> was matched, then true-expression is evaluated and 
-         sent to output, otherwise false-expression is evaluated and sent to output.</P>
-      <P>You will normally need to surround a conditional-expression with parenthesis in 
-         order to prevent ambiguities.</P>
-      <H4>Placeholder Sequences</H4>
-      <P>Placeholder sequences specify that some part of what matched the regular 
-         expression should be sent to output as follows:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Placeholder</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>$&amp;</TD>
-               <TD>Outputs what matched the whole expression.</TD>
-            </TR>
-            <TR>
-               <TD>$`</TD>
-               <TD>Outputs the text between the end of the last match found (or the start of the 
-                  text if no previous match was found), and the start of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$'</TD>
-               <TD>Outputs all the text following the end of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$$</TD>
-               <TD>Outputs a literal '$'</TD>
-            </TR>
-            <TR>
-               <TD>$n</TD>
-               <TD>Outputs what matched the n'th sub-expression.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Any $-placeholder sequence not listed above, results in '$' being treated as a 
-         literal.</P>
-      <H4>Escape Sequences</H4>
-      <P>An escape character followed by any character <EM>x</EM>, outputs that 
-         character unless <EM>x</EM> is one of the escape sequences shown below.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Escape</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>\a</TD>
-               <TD>Outputs the bell character: '\a'.</TD>
-            </TR>
-            <TR>
-               <TD>\e</TD>
-               <TD>Outputs the ANSI escape character (code point 27).</TD>
-            </TR>
-            <TR>
-               <TD>\f</TD>
-               <TD>Outputs a form feed character: '\f'</TD>
-            </TR>
-            <TR>
-               <TD>\n</TD>
-               <TD>Outputs a newline character: '\n'.</TD>
-            </TR>
-            <TR>
-               <TD>\r</TD>
-               <TD>Outputs a carriage return character: '\r'.</TD>
-            </TR>
-            <TR>
-               <TD>\t</TD>
-               <TD>Outputs a tab character: '\t'.</TD>
-            </TR>
-            <TR>
-               <TD>\v</TD>
-               <TD>Outputs a vertical tab character: '\v'.</TD>
-            </TR>
-            <TR>
-               <TD>\xDD</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDD</TD>
-            </TR>
-            <TR>
-               <TD>\x{DDDD}</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDDDDD</TD>
-            </TR>
-            <TR>
-               <TD>\cX</TD>
-               <TD>Outputs the ANSI escape sequence "escape-X".</TD>
-            </TR>
-            <TR>
-               <TD>\D</TD>
-               <TD>If <EM>D</EM> is a decimal digit in the range 1-9, then outputs the text that 
-                  matched sub-expression <EM>D</EM>.</TD>
-            </TR>
-            <TR>
-               <TD>\l</TD>
-               <TD>Causes the next character to be outputted, to be output in lower case.</TD>
-            </TR>
-            <TR>
-               <TD>\u</TD>
-               <TD>Causes the next character to be outputted, to be output in upper case.</TD>
-            </TR>
-            <TR>
-               <TD>\L</TD>
-               <TD>Causes all subsequent characters to be output in lower case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\U</TD>
-               <TD>Causes all subsequent characters to be output in upper case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\E</TD>
-               <TD>Terminates a \L or \U sequence.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/format_perl_syntax.html b/doc/Attic/format_perl_syntax.html
deleted file mode 100644
index 481a141a..00000000
--- a/doc/Attic/format_perl_syntax.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Perl-Style Format String Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Perl-Style Format String Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Perl-style format strings treat all characters as literals except '$' and '\' 
-         which start placeholder and escape sequences respectively.</P>
-      <P>Placeholder sequences specify that some part of what matched the regular 
-         expression should be sent to output as follows:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Placeholder</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>$&amp;</TD>
-               <TD>Outputs what matched the whole expression.</TD>
-            </TR>
-            <TR>
-               <TD>$`</TD>
-               <TD>Outputs the text between the end of the last match found (or the start of the 
-                  text if no previous match was found), and the start of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$'</TD>
-               <TD>Outputs all the text following the end of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$$</TD>
-               <TD>Outputs a literal '$'</TD>
-            </TR>
-            <TR>
-               <TD>$n</TD>
-               <TD>Outputs what matched the n'th sub-expression.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Any $-placeholder sequence not listed above, results in '$' being treated as a 
-         literal.</P>
-      <P>An escape character followed by any character <EM>x</EM>, outputs that 
-         character unless <EM>x</EM> is one of the escape sequences shown below.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Escape</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>\a</TD>
-               <TD>Outputs the bell character: '\a'.</TD>
-            </TR>
-            <TR>
-               <TD>\e</TD>
-               <TD>Outputs the ANSI escape character (code point 27).</TD>
-            </TR>
-            <TR>
-               <TD>\f</TD>
-               <TD>Outputs a form feed character: '\f'</TD>
-            </TR>
-            <TR>
-               <TD>\n</TD>
-               <TD>Outputs a newline character: '\n'.</TD>
-            </TR>
-            <TR>
-               <TD>\r</TD>
-               <TD>Outputs a carriage return character: '\r'.</TD>
-            </TR>
-            <TR>
-               <TD>\t</TD>
-               <TD>Outputs a tab character: '\t'.</TD>
-            </TR>
-            <TR>
-               <TD>\v</TD>
-               <TD>Outputs a vertical tab character: '\v'.</TD>
-            </TR>
-            <TR>
-               <TD>\xDD</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDD</TD>
-            </TR>
-            <TR>
-               <TD>\x{DDDD}</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDDDDD</TD>
-            </TR>
-            <TR>
-               <TD>\cX</TD>
-               <TD>Outputs the ANSI escape sequence "escape-X".</TD>
-            </TR>
-            <TR>
-               <TD>\D</TD>
-               <TD>If <EM>D</EM> is a decimal digit in the range 1-9, then outputs the text that 
-                  matched sub-expression <EM>D</EM>.</TD>
-            </TR>
-            <TR>
-               <TD>\l</TD>
-               <TD>Causes the next character to be outputted, to be output in lower case.</TD>
-            </TR>
-            <TR>
-               <TD>\u</TD>
-               <TD>Causes the next character to be outputted, to be output in upper case.</TD>
-            </TR>
-            <TR>
-               <TD>\L</TD>
-               <TD>Causes all subsequent characters to be output in lower case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\U</TD>
-               <TD>Causes all subsequent characters to be output in upper case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\E</TD>
-               <TD>Terminates a \L or \U sequence.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/format_sed_syntax.html b/doc/Attic/format_sed_syntax.html
deleted file mode 100644
index ee0a331b..00000000
--- a/doc/Attic/format_sed_syntax.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Sed-Style Format String Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Sed-Style Format String Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Sed-style format strings treat all characters as literals except:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="4" cellPadding="3" width="100%" border="0">
-            <TR>
-               <TD>&amp;</TD>
-               <TD>The ampersand character is replaced in the output stream by the the whole of 
-                  what matched the regular expression.&nbsp; Use \&amp; to output a literal 
-                  '&amp;' character.</TD>
-            </TR>
-            <TR>
-               <TD>\</TD>
-               <TD>Specifies an escape sequence.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-      <P>An escape character followed by any character <EM>x</EM>, outputs that 
-         character unless <EM>x</EM> is one of the escape sequences shown below.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Escape</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>\a</TD>
-               <TD>Outputs the bell character: '\a'.</TD>
-            </TR>
-            <TR>
-               <TD>\e</TD>
-               <TD>Outputs the ANSI escape character (code point 27).</TD>
-            </TR>
-            <TR>
-               <TD>\f</TD>
-               <TD>Outputs a form feed character: '\f'</TD>
-            </TR>
-            <TR>
-               <TD>\n</TD>
-               <TD>Outputs a newline character: '\n'.</TD>
-            </TR>
-            <TR>
-               <TD>\r</TD>
-               <TD>Outputs a carriage return character: '\r'.</TD>
-            </TR>
-            <TR>
-               <TD>\t</TD>
-               <TD>Outputs a tab character: '\t'.</TD>
-            </TR>
-            <TR>
-               <TD>\v</TD>
-               <TD>Outputs a vertical tab character: '\v'.</TD>
-            </TR>
-            <TR>
-               <TD>\xDD</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDD</TD>
-            </TR>
-            <TR>
-               <TD>\x{DDDD}</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDDDDD</TD>
-            </TR>
-            <TR>
-               <TD>\cX</TD>
-               <TD>Outputs the ANSI escape sequence "escape-X".</TD>
-            </TR>
-            <TR>
-               <TD>\D</TD>
-               <TD>If <EM>D</EM> is a decimal digit in the range 1-9, then outputs the text that 
-                  matched sub-expression <EM>D</EM>.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/format_syntax.html b/doc/Attic/format_syntax.html
deleted file mode 100644
index c7061d21..00000000
--- a/doc/Attic/format_syntax.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Format String Syntax</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Format String Syntax</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>Format strings are used by the algorithm <a href="regex_replace.html">regex_replace</a>&nbsp;and 
-         by <a href="match_results.html#m12">match_results::format</a>, and are used to 
-         transform one string into another.</p>
-      <p>
-         There are three kind of format string: Sed, Perl and Boost-extended.</p>
-      <P>Alternatively, when the flag <code>format_literal</code> is passed to one of these 
-         functions, then the format string is treated as a string literal, and is copied 
-         unchanged to the output.</P>
-      <P><A href="format_sed_syntax.html">Sed Style Format Strings</A><BR>
-         <A href="format_perl_syntax.html">Perl Style Format Strings</A><BR>
-         <A href="format_boost_syntax.html">Boost-Extended Format Strings</A></P>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/headers.html b/doc/Attic/headers.html
deleted file mode 100644
index 031d33fe..00000000
--- a/doc/Attic/headers.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Headers</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Headers</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>There are two main headers used by this library: &lt;boost/regex.hpp&gt; 
-         provides full access to the main template library, while 
-         &lt;boost/cregex.hpp&gt; provides access to the (deprecated) high level class 
-         RegEx, and the POSIX API functions.
-      </P>
-      <P>There is also a header containing only forward declarations 
-         &lt;boost/regex_fwd.hpp&gt; for use when an interface is dependent upon 
-         boost::basic_regex, but otherwise does not need the full definitions.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/history.html b/doc/Attic/history.html
deleted file mode 100644
index 72a50f03..00000000
--- a/doc/Attic/history.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: History</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">History</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Boost 1.34</P>
-      <UL>
-         <LI>
-         Fix for non-greedy repeats and partial matches not working correctly in some 
-         cases.
-         <LI>
-         Fix for non-greedy repeats on VC++ not working in some cases (bug report 
-         1515830).
-         <LI>
-            Changed match_results::position() to return a valid result when *this 
-            represents a partial match.</LI>
-      </UL>
-      <P>Boost 1.33.1</P>
-      <UL>
-         <LI>
-         Fixed broken makefiles.
-         <LI>
-         Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when 
-         using /Zc:wchar_t.
-         <LI>
-         Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler 
-         can cope.
-         <LI>
-         Added needed standard library #includes to fileiter.hpp, regex_workaround.hpp 
-         and cpp_regex_traits.hpp.
-         <LI>
-         Fixed a bug where non-greedy repeats could in certain strange curcumstances 
-         repeat more times than their maximum value.
-         <LI>
-         Fixed the value returned by basic_regex&lt;&gt;::empty() from a default 
-         constructed object.
-         <LI>
-         Changed the deffinition of regex_error to make it backwards compatible with 
-         Boost-1.32.0.
-         <LI>
-         Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
-         unresolved references can occur.
-         <LI>
-         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.
-         <LI>
-         Initialise all the data members of the unicode_iterators: this keeps gcc from 
-         issuing needless warnings.
-         <LI>
-         Ported the ICU integration code to VC6 and VC7.
-         <LI>
-         Ensured code is STLport debug mode clean.
-         <LI>
-         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).
-         <LI>
-         Fixed strange bug with non-greedy repeats inside forward lookahead assertions.
-         <LI>
-         Enabled negated character classes inside character sets.
-         <LI>
-         Fixed regression so that [a-z-] is a valid expression again.
-         <LI>
-            Fixed bug that allowed some invalid expressions to be accepted.</LI></UL>
-      <P>Boost 1.33.0.</P>
-      <UL>
-         <LI>
-         Completely rewritten expression parsing code, and traits class support; now 
-         conforms to the standardization proposal.
-         <LI>
-            <STRONG>Breaking Change:</STRONG> The <A href="syntax_option_type.html">syntax 
-               options</A> that can be passed to <A href="basic_regex.html">basic_regex 
-               constructors</A> have been rationalized.&nbsp; The default option (perl) now 
-            has a value of zero, and it is now clearly documented which options apply to 
-            which <A href="syntax.html">regular expression syntax styles (perl, 
-               POSIX-extended, POSIX-basic etc)</A>.&nbsp; Some of the more esoteric 
-         options have now been removed, so there is the possibility that existing code 
-         may fail to compile: however equivalent functionality should still be 
-         available.
-         <LI>
-            <STRONG>Breaking Change: </STRONG>
-         POSIX-extended and POSIX-basic regular expressions now enforce the letter of 
-         the POSIX standard much more closely than before.
-         <LI>
-            Added <A href="syntax_perl.html#Perl">support for (?imsx-imsx) constructs</A>.
-         <LI>
-            Added <A href="syntax_perl.html#Perl">support for lookbehind expressions 
-               (?&lt;=positive-lookbehind) and (?&lt;!negative-lookbehind)</A>.
-         <LI>
-            Added <A href="syntax_perl.html#Perl">support for conditional expressions 
-               (?(assertion)true-expresion|false-expression)</A>.
-         <LI>
-            Added <A href="mfc_strings.html">MFC/ATL string wrappers</A>.
-         <LI>
-            Added <A href="unicode.html">Unicode support; based on ICU</A>.
-         <LI>
-         Changed newline support to recognise \f as a line separator (all character 
-         types), and \x85 as a line separator for wide characters / Unicode only.
-         <LI>
-            Added a new format flag <A href="match_flag_type.html"><code>format_literal</code></A>
-            that treats the replace string as a literal, rather than a Perl or Sed style <A href="format_syntax.html">
-               format string</A>.
-         <LI>
-            Errors are now reported by throwing exceptions of type <A href="bad_expression.html">
-               <code>regex_error</code></A>. The types used previously - <code>bad_expression</code>
-            and <code>bad_pattern</code> - are now just typedefs for <code>regex_error</code>. 
-            Type <code>regex_error</code> has a couple of new members: <code>code()</code> to 
-            report an error code rather than a string, and <code>position()</code> to 
-            report where in the expression the error occured.</LI></UL>
-      <P>Boost 1.32.1.</P>
-      <UL>
-         <LI>
-            Fixed bug in partial matches of bounded repeats of '.'.</LI></UL>
-      <P>Boost 1.31.0.</P>
-      <UL>
-         <LI>
-         Completely rewritten pattern matching code - it is now up to 10 times faster 
-         than before.
-         <LI>
-         Reorganized documentation.
-         <LI>
-            Deprecated all interfaces that are not part of the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-               regular expression standardization proposal</A>.
-         <LI>
-            Added <A href="regex_iterator.html">regex_iterator</A> and <A href="regex_token_iterator.html">
-               regex_token_iterator</A>
-         .
-         <LI>
-         Added support for Perl style independent sub-expressions.
-         <LI>
-            Added non-member operators to the<A href="sub_match.html"> sub_match class</A>, 
-         so that you can compare sub_match's with strings, or add them to a string to 
-         produce a new string.
-         <LI>
-            Added experimental support for <A href="captures.html">extended capture 
-               information</A>.
-         <LI>
-            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<A href="match_flag_type.html">
-               match_flag_type</A> to the regex algorithms then you will now get a compiler 
-            error.</LI></UL>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/icu_strings.html b/doc/Attic/icu_strings.html
deleted file mode 100644
index 39548198..00000000
--- a/doc/Attic/icu_strings.html
+++ /dev/null
@@ -1,468 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Working With Unicode and ICU String Types</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Working With Unicode and ICU String Types.</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#introduction">Introduction</a></dt> 
-         <dt><a href="#types">Unicode regular expression types</a></dt> 
-         <dt><a href="#algo">Regular Expression Algorithms</a>
-            <dd>
-               <dl class="index">
-                  <dt><a href="#u32regex_match">u32regex_match</a></dt> 
-                  <dt><a href="#u32regex_search">u32regex_search</a></dt> 
-                  <dt><a href="#u32regex_replace">u32regex_replace</a></dt> 
-               </dl>
-            </dd>
-         </dt>
-         <dt><a href="#iterators">Iterators</a>
-            <dd>
-               <dl class="index">
-                  <dt><a href="#u32regex_iterator">u32regex_iterator</a></dt> 
-                  <dt><a href="#u32regex_token_iterator">u32regex_token_iterator</a></dt> 
-               </dl>
-            </dd>
-         </dt>
-      </dl>
-      <H3><A name="introduction"></A>Introduction</H3>
-      <P>The header:</P>
-      <PRE>&lt;boost/regex/icu.hpp&gt;</PRE>
-      <P>contains the data types and algorithms necessary for working with regular 
-         expressions in a Unicode aware environment.&nbsp;
-      </P>
-      <P>In order to use this header you will need <A href="http://www.ibm.com/software/globalization/icu/">
-            the ICU library</A>, and you will need to have built the Boost.Regex library 
-         with <A href="install.html#unicode">ICU support enabled</A>.</P>
-      <P>The header will enable you to:</P>
-      <UL>
-         <LI>
-         Create regular expressions that treat Unicode strings as sequences of UTF-32 
-         code points.
-         <LI>
-         Create regular expressions that support various Unicode data properties, 
-         including character classification.
-         <LI>
-            Transparently search Unicode strings that are encoded as either UTF-8, UTF-16 
-            or UTF-32.</LI></UL>
-      <H3><A name="types"></A>Unicode regular expression types</H3>
-      <P>Header &lt;boost/regex/icu.hpp&gt; provides a regular expression&nbsp;traits 
-         class that handles UTF-32 characters:</P>
-      <PRE>class icu_regex_traits;</PRE>
-      <P>and a regular expression type based upon that:</P>
-      <PRE>typedef basic_regex&lt;UChar32,icu_regex_traits&gt; u32regex;</PRE>
-      <P>The type <EM>u32regex</EM> is regular expression type to use for all Unicode 
-         regular expressions; internally it uses UTF-32 code points, but can be created 
-         from, and used to search, either UTF-8, or UTF-16 encoded strings as well as 
-         UTF-32 ones.</P>
-      <P>The <A href="basic_regex.html#c2">constructors</A>, and <A href="basic_regex.html#a1">
-            assign</A> member functions of u32regex, require UTF-32 encoded strings, but 
-         there are a series of overloaded algorithms called make_u32regex which allow 
-         regular expressions to be created from UTF-8, UTF-16, or UTF-32 encoded 
-         strings:</P>
-      <PRE>template &lt;class InputIterator&gt; 
-u32regex make_u32regex(InputIterator i, InputIterator j, boost::regex_constants::syntax_option_type opt);
-</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the iterator 
-         sequence [i,j). The character encoding of the sequence is determined based upon <code>
-            sizeof(*i)</code>: 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.</P>
-      <PRE>u32regex make_u32regex(const char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);
-</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated UTF-8 characater sequence <EM>p</EM>.</P>
-      <PRE>u32regex make_u32regex(const unsigned char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated UTF-8 characater sequence <EM>p</EM>.u32regex 
-         make_u32regex(const wchar_t* p, boost::regex_constants::syntax_option_type opt 
-         = boost::regex_constants::perl);</P>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated characater sequence <EM>p</EM>.&nbsp; The character encoding of 
-         the sequence is determined based upon <CODE>sizeof(wchar_t)</CODE>: 1 implies 
-         UTF-8, 2 implies UTF-16, and 4 implies UTF-32.</P>
-      <PRE>u32regex make_u32regex(const UChar* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated UTF-16 characater sequence <EM>p</EM>.</P>
-      <PRE>template&lt;class C, class T, class A&gt;
-u32regex make_u32regex(const std::basic_string&lt;C, T, A&gt;&amp; s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the string <EM>s</EM>.&nbsp; 
-         The character encoding of the string is determined based upon <CODE>sizeof(C)</CODE>: 
-         1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.</P>
-      <PRE>u32regex make_u32regex(const UnicodeString&amp; s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the UTF-16 
-         encoding string <EM>s</EM>.</P>
-      <H3><A name="algo"></A>Regular Expression Algorithms</H3>
-      <P>The regular expression algorithms <A href="regex_match.html">regex_match</A>, <A href="regex_search.html">
-            regex_search</A> and <A href="regex_replace.html">regex_replace</A> all 
-         expect that the character sequence upon which they operate, is encoded in the 
-         same character encoding as the regular expression object with which they are 
-         used.&nbsp; For Unicode regular expressions that behavior is undesirable: while 
-         we may want to process the data in UTF-32 "chunks", the actual data is much 
-         more likely to encoded as either UTF-8 or UTF-16.&nbsp; Therefore the header 
-         &lt;boost/regex/icu.hpp&gt; provides a series of thin wrappers around these 
-         algorithms, called u32regex_match, u32regex_search, and u32regex_replace.&nbsp; 
-         These wrappers use iterator-adapters internally to make external UTF-8 or 
-         UTF-16 data look as though it's really a UTF-32 sequence, that can then be 
-         passed on to the "real" algorithm.</P>
-      <H4><A name="u32regex_match"></A>u32regex_match</H4>
-      <P>For each <A href="regex_match.html">regex_match</A> algorithm defined by 
-         &lt;boost/regex.hpp&gt;, then &lt;boost/regex/icu.hpp&gt; defines an overloaded 
-         algorithm that takes the same arguments, but which is called <EM>u32regex_match</EM>, 
-         and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an 
-         ICU&nbsp;UnicodeString as input.</P>
-      <P><STRONG>Example: </STRONG>match a password, encoded in a UTF-16 UnicodeString:</P>
-      <PRE>//
-// Find out if *password* meets our password requirements,
-// as defined by the regular expression *requirements*.
-//
-bool is_valid_password(const UnicodeString&amp; password, const UnicodeString&amp; requirements)
-{
-   return boost::u32regex_match(password, boost::make_u32regex(requirements));
-}
-</PRE>
-      <P>
-      <P><STRONG>Example: </STRONG>match a UTF-8 encoded filename:</P>
-      <PRE>//
-// 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&amp; path)
-{
-   boost::u32regex r = boost::make_u32regex("(?:\\A|.*\\\\)([^\\\\]+)");
-   boost::smatch what;
-   if(boost::u32regex_match(path, what, r))
-   {
-      // extract $1 as a CString:
-      return what.str(1);
-   }
-   else
-   {
-      throw std::runtime_error("Invalid pathname");
-   }
-}
-</PRE>
-      <H4><A name="u32regex_search"></A>u32regex_search</H4>
-      <P>For each <A href="regex_search.html">regex_search</A> algorithm defined by 
-         &lt;boost/regex.hpp&gt;, then &lt;boost/regex/icu.hpp&gt; defines an overloaded 
-         algorithm that takes the same arguments, but which is called <EM>u32regex_search</EM>, 
-         and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an 
-         ICU&nbsp;UnicodeString as input.</P>
-      <P><STRONG>Example: </STRONG>search for a character sequence in a specific 
-         language block:
-      </P>
-      <PRE>UnicodeString extract_greek(const UnicodeString&amp; 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(L"[\\x{370}-\\x{3FF}](?:[^[:L*:]]|[\\x{370}-\\x{3FF}])*");
-   boost::u16match what;
-   if(boost::u32regex_search(text, what, r))
-   {
-      // extract $0 as a CString:
-      return UnicodeString(what[0].first, what.length(0));
-   }
-   else
-   {
-      throw std::runtime_error("No Greek found!");
-   }
-}</PRE>
-      <H4><A name="u32regex_replace"></A>u32regex_replace</H4>
-      <P>For each <A href="regex_replace.html">regex_replace</A> algorithm defined by 
-         &lt;boost/regex.hpp&gt;, then &lt;boost/regex/icu.hpp&gt; defines an overloaded 
-         algorithm that takes the same arguments, but which is called <EM>u32regex_replace</EM>, 
-         and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an 
-         ICU&nbsp;UnicodeString as input.&nbsp; The input sequence and the format string 
-         specifier passed to the algorithm, can be encoded independently (for example 
-         one can be UTF-8, the other in UTF-16), but the result string / output iterator 
-         argument must use the same character encoding as the text being searched.</P>
-      <P><STRONG>Example: </STRONG>Credit card number reformatting:</P>
-      <PRE>//
-// 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";
-
-UnicodeString human_readable_card_number(const UnicodeString&amp; s)
-{
-   return boost::u32regex_replace(s, e, human_format);
-}</PRE>
-      <P>
-         <H2><A name="iterators"></A>Iterators</H2>
-         <H3><A name="u32regex_iterator"></A>u32regex_iterator</H3>
-      <P>Type u32regex_iterator is in all respects the same as <A href="regex_iterator.html">
-            regex_iterator</A> except that since the regular expression type is always 
-         u32regex it only takes one template parameter (the iterator type). It also 
-         calls u32regex_search internally, allowing it to interface correctly with 
-         UTF-8, UTF-16, and UTF-32 data:</P>
-      <PRE>
-template &lt;class BidirectionalIterator&gt;
-class u32regex_iterator
-{
-   // for members see <A href="regex_iterator.html">regex_iterator</A>
-};
-
-typedef u32regex_iterator&lt;const char*&gt;     utf8regex_iterator;
-typedef u32regex_iterator&lt;const UChar*&gt;    utf16regex_iterator;
-typedef u32regex_iterator&lt;const UChar32*&gt;  utf32regex_iterator;
-</PRE>
-      <P>In order to simplify the construction of a u32regex_iterator from a string, 
-         there are a series of non-member helper functions called 
-         make_u32regex_iterator:</P>
-      <PRE>
-u32regex_iterator&lt;const char*&gt; 
-   make_u32regex_iterator(const char* s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-u32regex_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_iterator(const wchar_t* s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-u32regex_iterator&lt;const UChar*&gt; 
-   make_u32regex_iterator(const UChar* s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-template &lt;class charT, class Traits, class Alloc&gt;
-u32regex_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-u32regex_iterator&lt;const UChar*&gt; 
-   make_u32regex_iterator(const UnicodeString&amp; s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);</PRE>
-      <P>
-      <P>Each of these overloads returns an iterator that enumerates all occurrences of 
-         expression <EM>e</EM>, in text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <P><STRONG>Example</STRONG>: search for international currency symbols, along with 
-         their associated numeric value:</P>
-      <PRE>
-void enumerate_currencies(const std::string&amp; text)
-{
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
-      "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
-      "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
-      "(?(1)"
-         "|(?(2)"
-            "[[:Cf:][:Cc:][:Z*:]]*"
-         ")"
-         "[[:Sc:]]"
-      ")";
-   boost::u32regex r = boost::make_u32regex(re);
-   boost::u32regex_iterator&lt;std::string::const_iterator&gt; i(boost::make_u32regex_iterator(text, r)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; (*i)[0] &lt;&lt; std::endl;
-      ++i;
-   }
-}</PRE>
-      <P>
-      <P>Calling
-      </P>
-      <PRE>enumerate_currencies(" $100.23 or £198.12 ");</PRE>
-      <P>Yields the output:</P>
-      <PRE>$100.23<BR>£198.12</PRE>
-      <P>Provided of course that the input is encoded as UTF-8.</P>
-      <H3><A name="u32regex_token_iterator"></A>u32regex_token_iterator</H3>
-      <P>Type u32regex_token_iterator is in all respects the same as <A href="regex_token_iterator.html">
-            regex_token_iterator</A> except that since the regular expression type is 
-         always u32regex it only takes one template parameter (the iterator type).&nbsp; 
-         It also calls u32regex_search internally, allowing it to interface correctly 
-         with UTF-8, UTF-16, and UTF-32 data:</P>
-      <PRE>template &lt;class BidirectionalIterator&gt;
-class u32regex_token_iterator
-{
-   // for members see <A href="regex_token_iterator.html">regex_token_iterator</A>
-};
-
-typedef u32regex_token_iterator&lt;const char*&gt;     utf8regex_token_iterator;
-typedef u32regex_token_iterator&lt;const UChar*&gt;    utf16regex_token_iterator;
-typedef u32regex_token_iterator&lt;const UChar32*&gt;  utf32regex_token_iterator;
-</PRE>
-      <P>In order to simplify the construction of a u32regex_token_iterator from a 
-         string, there are a series of non-member helper functions called 
-         make_u32regex_token_iterator:</P>
-      <PRE>
-u32regex_token_iterator&lt;const char*&gt; 
-   make_u32regex_token_iterator(const char* s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                               
-u32regex_token_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_token_iterator(const wchar_t* s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UChar* s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;class charT, class Traits, class Alloc&gt;
-u32regex_token_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_token_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UnicodeString&amp; s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);</PRE>
-      <P>
-      <P>Each of these overloads returns an iterator that enumerates all occurrences of 
-         marked sub-expression <EM>sub</EM> in regular expression&nbsp;<EM>e</EM>, found 
-         in text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <PRE>
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const char*&gt; 
-   make_u32regex_token_iterator(const char* p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_token_iterator(const wchar_t* p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UChar* p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;class charT, class Traits, class Alloc, std::size_t N&gt;
-u32regex_token_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_token_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UnicodeString&amp; s, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P>Each of these overloads returns an iterator that enumerates one sub-expression 
-         for each&nbsp;<EM>submatch</EM> in regular expression&nbsp;<EM>e</EM>, found in 
-         text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <PRE>
-u32regex_token_iterator&lt;const char*&gt; 
-   make_u32regex_token_iterator(const char* p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_token_iterator(const wchar_t* p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UChar* p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;class charT, class Traits, class Alloc&gt;
-u32regex_token_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_token_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UnicodeString&amp; s, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P>Each of these overloads returns an iterator that enumerates one sub-expression 
-         for each&nbsp;<EM>submatch</EM> in regular expression&nbsp;<EM>e</EM>, found in 
-         text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <P><STRONG>Example</STRONG>: search for international currency symbols, along with 
-         their associated numeric value:</P>
-      <PRE>
-void enumerate_currencies2(const std::string&amp; text)
-{
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
-      "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
-      "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
-      "(?(1)"
-         "|(?(2)"
-            "[[:Cf:][:Cc:][:Z*:]]*"
-         ")"
-         "[[:Sc:]]"
-      ")";
-   boost::u32regex r = boost::make_u32regex(re);
-   boost::u32regex_token_iterator&lt;std::string::const_iterator&gt; 
-      i(boost::make_u32regex_token_iterator(text, r, 1)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; *i &lt;&lt; std::endl;
-      ++i;
-   }
-}
-</PRE>
-      <P>
-         <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-         05 Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2005</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
-
diff --git a/doc/Attic/implementation.html b/doc/Attic/implementation.html
deleted file mode 100644
index d2a9b5f2..00000000
--- a/doc/Attic/implementation.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Implementation</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Implementation</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Todo.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/install.html b/doc/Attic/install.html
deleted file mode 100644
index 4e4834c9..00000000
--- a/doc/Attic/install.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Installation</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Installation</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <P>When you extract the library from its zip file, you must preserve its internal 
-         directory structure (for example by using the -d option when extracting). If 
-         you didn't do that when extracting, then you'd better stop reading this, delete 
-         the files you just extracted, and try again!
-      </P>
-      <P>This library should not need configuring before use; most popular 
-         compilers/standard libraries/platforms are already supported "as is". If you do 
-         experience configuration problems, or just want to test the configuration with 
-         your compiler, then the process is the same as for all of boost; see the <A href="../../config/config.htm">
-            configuration library documentation</A>.</P>
-      <P>The library will encase all code inside namespace boost.
-      </P>
-      <P>Unlike some other template libraries, this library consists of a mixture of 
-         template code (in the headers) and static code and data (in cpp files). 
-         Consequently it is necessary to build the library's support code into a library 
-         or archive file before you can use it, instructions for specific platforms are 
-         as follows:
-      </P>
-      <H3><A name="bjam"></A>Building with bjam</H3>
-      <P>This is now the preferred method for building and installing this library, 
-         please refer to the <A href="../../../more/getting_started.html">getting started 
-            guide</A> for more information.</P>
-      <H3><A name="unicode"></A>Building With Unicode and ICU Support</H3>
-      <P>A default build of this library does not enable <A href="unicode.html">Unciode 
-            support</A> via ICU.&nbsp; There is no need to enable this support if you 
-         don't need it, but if you use ICU for your Unicode support already, and want to 
-         work with Unicode-aware regular expressions then read on.</P>
-      <P>Most of the information you will need is in the <A href="../../../more/getting_started.html">
-            getting started guide</A>, the only additional step you need to take is to 
-         tell bjam that you want Boost.Regex to use ICU and optionally to tell bjam 
-         where ICU is located.</P>
-      <P>If you're building on a Unix-like platform, and ICU is already installed in 
-         you're compilers search path (with an install&nbsp;prefix of /usr or /usr/local 
-         for example), then set the environment variable HAVE_ICU to enable ICU 
-         support.&nbsp; For example you might build with the command line:</P>
-      <PRE>bjam -sHAVE_ICU=1 --toolset=<A href="../../../more/getting_started/windows.html#toolset-name">toolset-name</A> install</PRE>
-      <P>If ICU is not already in your compilers path then you need to set the 
-         environment variable ICU_PATH to point to the route directory of your ICU 
-         installation, for example if ICU was installed to /usr/local/icu/3.3 you might 
-         use:</P>
-      <PRE>bjam -sICU_PATH=/usr/local/icu/3.3 --toolset=<A href="../../../more/getting_started/windows.html#toolset-name">toolset-name</A> install</PRE>
-      <P>Note that ICU is a C++ library just like Boost is, as such your copy of ICU 
-         must have been built with the same C++ compiler (and compiler version) that you 
-         are using to build Boost.&nbsp; <STRONG>Boost.Regex will not work correctly unless 
-            you ensure that this is the case:</STRONG> it is up to you to ensure that 
-         the version of ICU you are using is binary compatible with the toolset you use 
-         to build Boost.</P>
-      <H2><A name="make"></A>Building via makefiles</H2>
-      <H3><A name="bcb"></A>Borland C++ Builder:
-      </H3>
-      <UL>
-         <LI>
-         Open up a console window and change to the &lt;boost&gt;\libs\regex\build 
-         directory.
-         <LI>
-         Select the appropriate makefile (bcb4.mak for C++ Builder 4, bcb5.mak for C++ 
-         Builder 5, and bcb6.mak for C++ Builder 6).
-         <LI>
-            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:
-         </LI>
-      </UL>
-      <PRE>make -fbcb5.mak</PRE>
-      <P>The build process will build a variety of .lib and .dll files (the exact number 
-         depends upon the version of Borland's tools you are using) the .lib and dll 
-         files will be in a sub-directory called bcb4 or bcb5 depending upon the 
-         makefile used. To install the libraries into your development system use:</P>
-      <PRE>make -fbcb5.mak install</PRE>
-      <P>library files will be copied to &lt;BCROOT&gt;/lib and the dll's to 
-         &lt;BCROOT&gt;/bin, where &lt;BCROOT&gt; corresponds to the install path of 
-         your Borland C++ tools.
-      </P>
-      <P>You may also remove temporary files created during the build process (excluding 
-         lib and dll files) by using:</P>
-      <PRE>make -fbcb5.mak clean</PRE>
-      <P>Finally when you use regex++ it is only necessary for you to add the 
-         &lt;boost&gt; root director to your list of include directories for that 
-         project. It is not necessary for you to manually add a .lib file to the 
-         project; the headers will automatically select the correct .lib file for your 
-         build mode and tell the linker to include it. There is one caveat however: the 
-         library can not tell the difference between VCL and non-VCL enabled builds when 
-         building a GUI application from the command line, if you build from the command 
-         line with the 5.5 command line tools then you must define the pre-processor 
-         symbol _NO_VCL in order to ensure that the correct link libraries are selected: 
-         the C++ Builder IDE normally sets this automatically. Hint, users of the 5.5 
-         command line tools may want to add a -D_NO_VCL to bcc32.cfg in order to set 
-         this option permanently.
-      </P>
-      <P>If you would prefer to do a dynamic link to the regex libraries when using the 
-         dll runtime then define BOOST_REGEX_DYN_LINK (you must do this if you want to 
-         use boost.regex in multiple dll's), otherwise Boost.regex will be statically 
-         linked by default.&nbsp;</P>
-      <P>If you want to suppress automatic linking altogether (and supply your own 
-         custom build of the lib) then define BOOST_REGEX_NO_LIB.</P>
-      <P>If you are building with C++ Builder 6, you will find that 
-         &lt;boost/regex.hpp&gt; can not be used in a pre-compiled header (the actual 
-         problem is in &lt;locale&gt; which gets included by &lt;boost/regex.hpp&gt;), 
-         if this causes problems for you, then try defining BOOST_NO_STD_LOCALE when 
-         building, this will disable some features throughout boost, but may save you a 
-         lot in compile times!</P>
-      <H3><A name="vc"></A>Microsoft Visual C++ 6, 7, 7.1 and 8</H3>
-      <P>You need version 6 of MSVC to build this library. If you are using VC5 then you 
-         may want to look at one of the previous releases of this <A href="http://ourworld.compuserve.com/homepages/john_maddock/regexpp.htm">
-            library</A>
-      </P>
-      <P>Open up a command prompt, which has the necessary MSVC environment variables 
-         defined (for example by using the batch file Vcvars32.bat installed by the 
-         Visual Studio installation), and change to the &lt;boost&gt;\libs\regex\build 
-         directory.
-      </P>
-      <P>Select the correct makefile - vc6.mak for "vanilla" Visual C++ 6 or 
-         vc6-stlport.mak if you are using STLPort.</P>
-      <P>Invoke the makefile like this:</P>
-      <PRE>nmake -fvc6.mak</PRE>
-      <P>You will now have a collection of lib and dll files in a "vc6" subdirectory, to 
-         install these into your development system use:</P>
-      <PRE>nmake -fvc6.mak install</PRE>
-      <P>The lib files will be copied to your &lt;VC6&gt;\lib directory and the dll 
-         files to &lt;VC6&gt;\bin, where &lt;VC6&gt; is the root of your Visual C++ 6 
-         installation.</P>
-      <P>You can delete all the temporary files created during the build (excluding lib 
-         and dll files) using:</P>
-      <PRE>nmake -fvc6.mak clean </PRE>
-      <P>If you want to build with ICU support, then you need to pass the path to your 
-         ICU directory to the makefile, for example with:
-      </P>
-      <PRE>nmake ICU_PATH=c:\open-source\icu -fvc71.mak install</PRE>
-      <P>Finally when you use regex++ it is only necessary for you to add the 
-         &lt;boost&gt; root directory to your list of include directories for that 
-         project. It is not necessary for you to manually add a .lib file to the 
-         project; the headers will automatically select the correct .lib file for your 
-         build mode and tell the linker to include it.
-      </P>
-      <P>Note that if you want to dynamically link to the regex library when using the 
-         dynamic C++ runtime, define BOOST_REGEX_DYN_LINK when building your project.</P>
-      <P>If you want to add the source directly to your project then define 
-         BOOST_REGEX_NO_LIB to disable automatic library selection.</P>
-      <P>There are several important caveats to remember when using boost.regex with 
-         Microsoft's Compiler:</P>
-      <UL>
-         <LI>
-         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 is to 
-         use all optimization settings except /Oa. This problem is reported to affect 
-         some standard library code as well (in fact I'm not sure if the problem is with 
-         the regex code or the underlying standard library), so it's probably worthwhile 
-         applying this workaround in normal practice in any case.
-         <LI>
-         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.
-         <LI>
-         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).
-         <LI>
-            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.
-         </LI>
-      </UL>
-      <H3><A name="gcc"></A>GCC(2.95 and 3.x)
-      </H3>
-      <P>You can build with gcc using the normal boost Jamfile in 
-         &lt;boost&gt;/libs/regex/build, alternatively there is a conservative makefile 
-         for the g++ compiler. From the command prompt change to the 
-         &lt;boost&gt;/libs/regex/build directory and type:
-      </P>
-      <PRE>make -fgcc.mak </PRE>
-      <P>At the end of the build process you should have a gcc sub-directory containing 
-         release and debug versions of the library (libboost_regex.a and 
-         libboost_regex_debug.a). When you build projects that use regex++, you will 
-         need to add the boost install directory to your list of include paths and add 
-         &lt;boost&gt;/libs/regex/build/gcc/libboost_regex.a to your list of library 
-         files.
-      </P>
-      <P>There is also a makefile to build the library as a shared library:</P>
-      <PRE>make -fgcc-shared.mak</PRE>
-      <P>which will build libboost_regex.so and libboost_regex_debug.so.</P>
-      <P>Both of the these makefiles support the following environment variables:</P>
-      <P>ICU_PATH: tells the makefile to build with Unicode support, set to the path 
-         where your ICU installation is located, for example with: <code>make 
-            ICU_PATH=/usr/local install -fgcc.mak</code></P>
-      <P>CXXFLAGS: extra compiler options - note that this applies to both the debug and 
-         release builds.</P>
-      <P>INCLUDES: additional include directories.</P>
-      <P>LDFLAGS: additional linker options.</P>
-      <P>LIBS: additional library files.</P>
-      <P>For the more adventurous there is a configure script in 
-         &lt;boost&gt;/libs/config; see the <A href="../../config/config.htm">config 
-            library documentation</A>.</P>
-      <H3><A name="sun"></A>Sun Workshop 6.1</H3>
-      <P>There is a makefile for the sun (6.1) compiler (C++ version 3.12). From the 
-         command prompt change to the &lt;boost&gt;/libs/regex/build directory and type:
-      </P>
-      <PRE>dmake -f sunpro.mak </PRE>
-      <P>At the end of the build process you should have a sunpro sub-directory 
-         containing single and multithread versions of the library (libboost_regex.a, 
-         libboost_regex.so, libboost_regex_mt.a and libboost_regex_mt.so). When you 
-         build projects that use regex++, you will need to add the boost install 
-         directory to your list of include paths and add 
-         &lt;boost&gt;/libs/regex/build/sunpro/ to your library search path.
-      </P>
-      <P>Both of the these makefiles support the following environment variables:</P>
-      <P>CXXFLAGS: extra compiler options - note that this applies to both the single 
-         and multithreaded builds.</P>
-      <P>INCLUDES: additional include directories.</P>
-      <P>LDFLAGS: additional linker options.</P>
-      <P>LIBS: additional library files.</P>
-      <P>LIBSUFFIX: a suffix to mangle the library name with (defaults to nothing).</P>
-      <P>This makefile does not set any architecture specific options like -xarch=v9, 
-         you can set these by defining the appropriate macros, for example:</P>
-      <PRE>dmake CXXFLAGS="-xarch=v9" LDFLAGS="-xarch=v9" LIBSUFFIX="_v9" -f sunpro.mak</PRE>
-      <P>will build v9 variants of the regex library named libboost_regex_v9.a etc.</P>
-      <H3><A name="other"></A>Makefiles for Other compilers:
-      </H3>
-      <P>There is a generic makefile (<A href="../build/generic.mak">generic.mak</A> ) 
-         provided in &lt;boost-root&gt;/libs/regex/build - see that makefile for details 
-         of environment variables that need to be set before use.
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-         09 Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2005<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/introduction.html b/doc/Attic/introduction.html
deleted file mode 100644
index 3a4fcc7c..00000000
--- a/doc/Attic/introduction.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Introduction</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Introduction</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Regular expressions are a form of pattern-matching that are often used in text 
-         processing; many users will be familiar with the Unix utilities <I>grep</I>, <I>sed</I>
-         and <I>awk</I>, and the programming language <I>Perl</I>, each of which make 
-         extensive use of regular expressions. Traditionally C++ users have been limited 
-         to the POSIX C API's for manipulating regular expressions, and while regex++ 
-         does provide these API's, they do not represent the best way to use the 
-         library. For example regex++ can cope with wide character strings, or search 
-         and replace operations (in a manner analogous to either sed or Perl), something 
-         that traditional C libraries can not do.</P>
-      <P>The class <A href="basic_regex.html">boost::basic_regex</A> is the key class in 
-         this library; it represents a "machine readable" regular expression, and is 
-         very closely modeled on std::basic_string, think of it as a string plus the 
-         actual state-machine required by the regular expression algorithms. Like 
-         std::basic_string there are two typedefs that are almost always the means by 
-         which this class is referenced:</P>
-      <pre><B>namespace </B>boost{
-
-<B>template</B> &lt;<B>class</B> charT, 
-<B>          class</B> traits = regex_traits&lt;charT&gt; &gt;
-<B>class</B> basic_regex;
-
-<B>typedef</B> basic_regex&lt;<B>char</B>&gt; regex;
-<B>typedef</B> basic_regex&lt;<B>wchar_t&gt;</B> wregex;
-
-}</pre>
-      <P>To see how this library can be used, imagine that we are writing a credit card 
-         processing application. Credit card numbers generally come as a string of 
-         16-digits, separated into groups of 4-digits, and separated by either a space 
-         or a hyphen. Before storing a credit card number in a database (not necessarily 
-         something your customers will appreciate!), we may want to verify that the 
-         number is in the correct format. To match any digit we could use the regular 
-         expression [0-9], however ranges of characters like this are actually locale 
-         dependent. Instead we should use the POSIX standard form [[:digit:]], or the 
-         regex++ and Perl shorthand for this \d (note that many older libraries tended 
-         to be hard-coded to the C-locale, consequently this was not an issue for them). 
-         That leaves us with the following regular expression to validate credit card 
-         number formats:</P>
-      <PRE>(\d{4}[- ]){3}\d{4}</PRE>
-      <P>Here the parenthesis act to group (and mark for future reference) 
-         sub-expressions, and the {4} means "repeat exactly 4 times". This is an example 
-         of the extended regular expression syntax used by Perl, awk and egrep. Regex++ 
-         also supports the older "basic" syntax used by sed and grep, but this is 
-         generally less useful, unless you already have some basic regular expressions 
-         that you need to reuse.</P>
-      <P>Now let's take that expression and place it in some C++ code to validate the 
-         format of a credit card number:</P>
-      <PRE><B>bool</B> validate_card_format(<B>const</B> std::string& s)
-{
-   <B>static</B> <B>const</B> <A href="basic_regex.html">boost::regex</A> e("(\\d{4}[- ]){3}\\d{4}");
-   <B>return</B> <A href="regex_match.html">regex_match</A>(s, e);
-}</PRE>
-      <P>Note how we had to add some extra escapes to the expression: remember that the 
-         escape is seen once by the C++ compiler, before it gets to be seen by the 
-         regular expression engine, consequently escapes in regular expressions have to 
-         be doubled up when embedding them in C/C++ code. Also note that all the 
-         examples assume that your compiler supports Koenig lookup, if yours doesn't 
-         (for example VC6), then you will have to add some boost:: prefixes to some of 
-         the function calls in the examples.</P>
-      <P>Those of you who are familiar with credit card processing, will have realized 
-         that while the format used above is suitable for human readable card numbers, 
-         it does not represent the format required by online credit card systems; these 
-         require the number as a string of 16 (or possibly 15) digits, without any 
-         intervening spaces. What we need is a means to convert easily between the two 
-         formats, and this is where search and replace comes in. Those who are familiar 
-         with the utilities <I>sed</I> and <I>Perl</I> will already be ahead here; we 
-         need two strings - one a regular expression - the other a "<A href="format_syntax.html">format 
-            string</A>" that provides a description of the text to replace the match 
-         with. In regex++ this search and replace operation is performed with the 
-         algorithm<A href="regex_replace.html"> regex_replace</A>, for our credit card 
-         example we can write two algorithms like this to provide the format 
-         conversions:</P>
-      <PRE><I>// match any format with the regular expression:
-</I><B>const</B> boost::regex e("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
-<B>const</B> std::string machine_format("\\1\\2\\3\\4");
-<B>const</B> std::string human_format("\\1-\\2-\\3-\\4");
-
-std::string machine_readable_card_number(<B>const</B> std::string s)
-{
-   <B>return</B> <A href="regex_replace.html">regex_replace</A>(s, e, machine_format, boost::match_default | boost::format_sed);
-}
-
-std::string human_readable_card_number(<B>const</B> std::string s)
-{
-   <B>return</B> <A href="regex_replace.html">regex_replace</A>(s, e, human_format, boost::match_default | boost::format_sed);
-}</PRE>
-      <P>Here we've used marked sub-expressions in the regular expression to split out 
-         the four parts of the card number as separate fields, the format string then 
-         uses the sed-like syntax to replace the matched text with the reformatted 
-         version.</P>
-      <P>In the examples above, we haven't directly manipulated the results of a regular 
-         expression match, however in general the result of a match contains a number of 
-         sub-expression matches in addition to the overall match. When the library needs 
-         to report a regular expression match it does so using an instance of the class <A href="match_results.html">
-            match_results</A>, as before there are typedefs of this class for the most 
-         common cases:
-      </P>
-      <PRE><B>namespace </B>boost{
-<B>typedef</B> match_results&lt;<B>const</B> <B>char</B>*&gt; cmatch;
-<B>typedef</B> match_results&lt;<B>const</B> <B>wchar_t</B>*&gt; wcmatch;
-<STRONG>typedef</STRONG> match_results&lt;std::string::const_iterator&gt; smatch;
-<STRONG>typedef</STRONG> match_results&lt;std::wstring::const_iterator&gt; wsmatch; 
-}</PRE>
-      <P>The algorithms <A href="regex_search.html">regex_search</A> and&nbsp;<A href="regex_match.html">regex_match</A>
-         make use of match_results to report what matched; the difference between these 
-         algorithms is that <A href="regex_match.html">regex_match</A> will only find 
-         matches that consume <EM>all</EM> of the input text, where as <A href="regex_search.html">
-            regex_search</A> will <EM>search</EM> for a match anywhere within the text 
-         being matched.</P>
-      <P>Note that these algorithms are not restricted to searching regular C-strings, 
-         any bidirectional iterator type can be searched, allowing for the possibility 
-         of seamlessly searching almost any kind of data.
-      </P>
-      <P>For search and replace operations, in addition to the algorithm <A href="regex_replace.html">
-            regex_replace</A> that we have already seen, the <A href="match_results.html">match_results</A>
-         class has a format member that takes the result of a match and a format string, 
-         and produces a new string by merging the two.</P>
-      <P>For iterating through all occurences of an expression within a text, there are 
-         two iterator types: <A href="regex_iterator.html">regex_iterator</A> will 
-         enumerate over the <A href="match_results.html">match_results</A> objects 
-         found, while <A href="regex_token_iterator.html">regex_token_iterator</A> will 
-         enumerate a series of strings (similar to perl style split operations).</P>
-      <P>For those that dislike templates, there is a high level wrapper class RegEx 
-         that is an encapsulation of the lower level template code - it provides a 
-         simplified interface for those that don't need the full power of the library, 
-         and supports only narrow characters, and the "extended" regular expression 
-         syntax. This class is now deprecated as it does not form part of the regular 
-         expressions C++ standard library proposal.
-      </P>
-      <P>The <A href="posix_api.html">POSIX API</A> functions: regcomp, regexec, regfree 
-         and regerror, are available in both narrow character and Unicode versions, and 
-         are provided for those who need compatibility with these API's.
-      </P>
-      <P>Finally, note that the library now has run-time <A href="localisation.html">localization</A>
-         support, and recognizes the full POSIX regular expression syntax - including 
-         advanced features like multi-character collating elements and equivalence 
-         classes - as well as providing compatibility with other regular expression 
-         libraries including GNU and BSD4 regex packages, and to a more limited extent 
-         Perl 5.
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/localisation.html b/doc/Attic/localisation.html
deleted file mode 100644
index 31bd8663..00000000
--- a/doc/Attic/localisation.html
+++ /dev/null
@@ -1,808 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Localisation</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Localisation</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>Boost.regex&nbsp;provides extensive support for run-time localization, the 
-         localization model used can be split into two parts: front-end and back-end.</p>
-      <p>Front-end localization deals with everything which the user sees - error 
-         messages, and the regular expression syntax itself. For example a French 
-         application could change [[:word:]] to [[:mot:]] and \w to \m. Modifying the 
-         front end locale requires active support from the developer, by providing the 
-         library with a message catalogue to load, containing the localized strings. 
-         Front-end locale is affected by the LC_MESSAGES category only.</p>
-      <p>Back-end localization deals with everything that occurs after the expression 
-         has been parsed - in other words everything that the user does not see or 
-         interact with directly. It deals with case conversion, collation, and character 
-         class membership. The back-end locale does not require any intervention from 
-         the developer - the library will acquire all the information it requires for 
-         the current locale from the underlying operating system / run time library. 
-         This means that if the program user does not interact with regular expressions 
-         directly - for example if the expressions are embedded in your C++ code - then 
-         no explicit localization is required, as the library will take care of 
-         everything for you. For example embedding the expression [[:word:]]+ in your 
-         code will always match a whole word, if the program is run on a machine with, 
-         for example, a Greek locale, then it will still match a whole word, but in 
-         Greek characters rather than Latin ones. The back-end locale is affected by the 
-         LC_TYPE and LC_COLLATE categories.</p>
-      <p>There are three separate localization mechanisms supported by boost.regex:</p>
-      <h3>Win32 localization model.</h3>
-      <p>This is the default model when the library is compiled under Win32, and is 
-         encapsulated by the traits class w32_regex_traits. When this model is in effect 
-         each basic_regex object gets it's own LCID, by default this is the users 
-         default setting as returned by GetUserDefaultLCID, but you can call <EM>imbue</EM>
-         on the basic_regex object to set it's locale to some other LCID if you wish. 
-         All the settings used by boost.regex are acquired directly from the operating 
-         system bypassing the C run time library. Front-end localization requires a 
-         resource dll, containing a string table with the user-defined strings. The 
-         traits class exports the function:</p>
-      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
-      <p>which needs to be called with a string identifying the name of the resource 
-         dll, <i>before</i> your code compiles any regular expressions (but not 
-         necessarily before you construct any <i>basic_regex</i> instances):</p>
-      <p>
-         boost::w32_regex_traits&lt;char&gt;::set_message_catalogue("mydll.dll");</p>
-      <p>
-         The library provides full Unicode support under NT, under Windows 9x the 
-         library degrades gracefully - characters 0 to 255 are supported, the remainder 
-         are treated as "unknown" graphic characters.</p>
-      <h3>C localization model.</h3>
-      <p>This model has been deprecated in favor of the C++ localoe for all non-Windows 
-         compilers that support&nbsp;it.&nbsp; This locale is encapsulated by the traits 
-         class <i>c_regex_traits</i>, Win32 users can force this model to take effect by 
-         defining the pre-processor symbol BOOST_REGEX_USE_C_LOCALE. When this model is 
-         in effect there is a single global locale, as set by <i>setlocale</i>. All 
-         settings are acquired from your run time library, consequently Unicode support 
-         is dependent upon your run time library implementation.</p>
-      <P>Front end localization is not supported.</P>
-      <P>Note that calling <i>setlocale</i> invalidates all compiled regular 
-         expressions, calling <tt>setlocale(LC_ALL, "C")</tt> will make this library 
-         behave equivalent to most traditional regular expression libraries including 
-         version 1 of this library.</P>
-      <h3>C++ localization model.</h3>
-      <p>This model is the default for non-Windows compilers.</p>
-      <P>
-         When this model is in effect each instance of basic_regex&lt;&gt; has its own 
-         instance of std::locale, class basic_regex&lt;&gt; also has a member function <i>imbue</i>
-         which allows the locale for the expression to be set on a per-instance basis. 
-         Front end localization requires a POSIX message catalogue, which will be loaded 
-         via the std::messages facet of the expression's locale, the traits class 
-         exports the symbol:</P>
-      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
-      <p>which needs to be called with a string identifying the name of the message 
-         catalogue, <i>before</i> your code compiles any regular expressions (but not 
-         necessarily before you construct any <i>basic_regex</i> instances):</p>
-      <p>
-         boost::cpp_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-      <p>Note that calling basic_regex&lt;&gt;::imbue will invalidate any expression 
-         currently compiled in that instance of basic_regex&lt;&gt;.</p>
-      <P>Finally note that if you build the library with a non-default localization 
-         model, then the appropriate pre-processor symbol (BOOST_REGEX_USE_C_LOCALE or 
-         BOOST_REGEX_USE_CPP_LOCALE) must be defined both when you build the support 
-         library, and when you include &lt;boost/regex.hpp&gt; or 
-         &lt;boost/cregex.hpp&gt; in your code. The best way to ensure this is to add 
-         the #define to &lt;boost/regex/user.hpp&gt;.</P>
-      <h3>Providing a message catalogue:</h3>
-      <p>
-         In order to localize the front end of the library, you need to provide the 
-         library with the appropriate message strings contained either in a resource 
-         dll's string table (Win32 model), or a POSIX message catalogue (C++ models). In 
-         the latter case the messages must appear in message set zero of the catalogue. 
-         The messages and their id's are as follows:<br>
-         &nbsp;</p>
-      <p></p>
-      <table id="Table2" cellspacing="0" cellpadding="6" width="624" border="0">
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">Message id</td>
-            <td valign="top" width="32%">Meaning</td>
-            <td valign="top" width="29%">Default value</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">101</td>
-            <td valign="top" width="32%">The character used to start a sub-expression.</td>
-            <td valign="top" width="29%">"("</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">102</td>
-            <td valign="top" width="32%">The character used to end a sub-expression 
-               declaration.</td>
-            <td valign="top" width="29%">")"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">103</td>
-            <td valign="top" width="32%">The character used to denote an end of line 
-               assertion.</td>
-            <td valign="top" width="29%">"$"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">104</td>
-            <td valign="top" width="32%">The character used to denote the start of line 
-               assertion.</td>
-            <td valign="top" width="29%">"^"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">105</td>
-            <td valign="top" width="32%">The character used to denote the "match any character 
-               expression".</td>
-            <td valign="top" width="29%">"."</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">106</td>
-            <td valign="top" width="32%">The match zero or more times repetition operator.</td>
-            <td valign="top" width="29%">"*"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">107</td>
-            <td valign="top" width="32%">The match one or more repetition operator.</td>
-            <td valign="top" width="29%">"+"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">108</td>
-            <td valign="top" width="32%">The match zero or one repetition operator.</td>
-            <td valign="top" width="29%">"?"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">109</td>
-            <td valign="top" width="32%">The character set opening character.</td>
-            <td valign="top" width="29%">"["</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">110</td>
-            <td valign="top" width="32%">The character set closing character.</td>
-            <td valign="top" width="29%">"]"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">111</td>
-            <td valign="top" width="32%">The alternation operator.</td>
-            <td valign="top" width="29%">"|"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">112</td>
-            <td valign="top" width="32%">The escape character.</td>
-            <td valign="top" width="29%">"\\"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">113</td>
-            <td valign="top" width="32%">The hash character (not currently used).</td>
-            <td valign="top" width="29%">"#"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">114</td>
-            <td valign="top" width="32%">The range operator.</td>
-            <td valign="top" width="29%">"-"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">115</td>
-            <td valign="top" width="32%">The repetition operator opening character.</td>
-            <td valign="top" width="29%">"{"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">116</td>
-            <td valign="top" width="32%">The repetition operator closing character.</td>
-            <td valign="top" width="29%">"}"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">117</td>
-            <td valign="top" width="32%">The digit characters.</td>
-            <td valign="top" width="29%">"0123456789"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">118</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the word boundary assertion.</td>
-            <td valign="top" width="29%">"b"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">119</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the non-word boundary assertion.</td>
-            <td valign="top" width="29%">"B"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">120</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the word-start boundary assertion.</td>
-            <td valign="top" width="29%">"&lt;"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">121</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the word-end boundary assertion.</td>
-            <td valign="top" width="29%">"&gt;"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">122</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any word character.</td>
-            <td valign="top" width="29%">"w"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">123</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents a non-word character.</td>
-            <td valign="top" width="29%">"W"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">124</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents a start of buffer assertion.</td>
-            <td valign="top" width="29%">"`A"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">125</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents an end of buffer assertion.</td>
-            <td valign="top" width="29%">"'z"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">126</td>
-            <td valign="top" width="32%">The newline character.</td>
-            <td valign="top" width="29%">"\n"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">127</td>
-            <td valign="top" width="32%">The comma separator.</td>
-            <td valign="top" width="29%">","</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">128</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the bell character.</td>
-            <td valign="top" width="29%">"a"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">129</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the form feed character.</td>
-            <td valign="top" width="29%">"f"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">130</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the newline character.</td>
-            <td valign="top" width="29%">"n"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">131</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the carriage return character.</td>
-            <td valign="top" width="29%">"r"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">132</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the tab character.</td>
-            <td valign="top" width="29%">"t"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">133</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the vertical tab character.</td>
-            <td valign="top" width="29%">"v"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">134</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the start of a hexadecimal character constant.</td>
-            <td valign="top" width="29%">"x"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">135</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the start of an ASCII escape character.</td>
-            <td valign="top" width="29%">"c"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">136</td>
-            <td valign="top" width="32%">The colon character.</td>
-            <td valign="top" width="29%">":"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">137</td>
-            <td valign="top" width="32%">The equals character.</td>
-            <td valign="top" width="29%">"="</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">138</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the ASCII escape character.</td>
-            <td valign="top" width="29%">"e"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">139</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any lower case character.</td>
-            <td valign="top" width="29%">"l"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">140</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-lower case character.</td>
-            <td valign="top" width="29%">"L"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">141</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any upper case character.</td>
-            <td valign="top" width="29%">"u"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">142</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-upper case character.</td>
-            <td valign="top" width="29%">"U"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">143</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any space character.</td>
-            <td valign="top" width="29%">"s"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">144</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-space character.</td>
-            <td valign="top" width="29%">"S"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">145</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any digit character.</td>
-            <td valign="top" width="29%">"d"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">146</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-digit character.</td>
-            <td valign="top" width="29%">"D"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">147</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the end quote operator.</td>
-            <td valign="top" width="29%">"E"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">148</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the start quote operator.</td>
-            <td valign="top" width="29%">"Q"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">149</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents a Unicode combining character sequence.</td>
-            <td valign="top" width="29%">"X"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">150</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any single character.</td>
-            <td valign="top" width="29%">"C"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">151</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents end of buffer operator.</td>
-            <td valign="top" width="29%">"Z"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">152</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the continuation assertion.</td>
-            <td valign="top" width="29%">"G"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td>153</td>
-            <td>The character which when preceeded by (? indicates a zero width negated 
-               forward lookahead assert.</td>
-            <td>!</td>
-            <td>&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>Custom error messages are loaded as follows:&nbsp;</p>
-      <p></p>
-      <table id="Table3" cellspacing="0" cellpadding="7" width="624" border="0">
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">Message ID</td>
-            <td valign="top" width="32%">Error message ID</td>
-            <td valign="top" width="31%">Default string</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">201</td>
-            <td valign="top" width="32%">REG_NOMATCH</td>
-            <td valign="top" width="31%">"No match"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">202</td>
-            <td valign="top" width="32%">REG_BADPAT</td>
-            <td valign="top" width="31%">"Invalid regular expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">203</td>
-            <td valign="top" width="32%">REG_ECOLLATE</td>
-            <td valign="top" width="31%">"Invalid collation character"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">204</td>
-            <td valign="top" width="32%">REG_ECTYPE</td>
-            <td valign="top" width="31%">"Invalid character class name"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">205</td>
-            <td valign="top" width="32%">REG_EESCAPE</td>
-            <td valign="top" width="31%">"Trailing backslash"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">206</td>
-            <td valign="top" width="32%">REG_ESUBREG</td>
-            <td valign="top" width="31%">"Invalid back reference"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">207</td>
-            <td valign="top" width="32%">REG_EBRACK</td>
-            <td valign="top" width="31%">"Unmatched [ or [^"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">208</td>
-            <td valign="top" width="32%">REG_EPAREN</td>
-            <td valign="top" width="31%">"Unmatched ( or \\("</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">209</td>
-            <td valign="top" width="32%">REG_EBRACE</td>
-            <td valign="top" width="31%">"Unmatched \\{"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">210</td>
-            <td valign="top" width="32%">REG_BADBR</td>
-            <td valign="top" width="31%">"Invalid content of \\{\\}"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">211</td>
-            <td valign="top" width="32%">REG_ERANGE</td>
-            <td valign="top" width="31%">"Invalid range end"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">212</td>
-            <td valign="top" width="32%">REG_ESPACE</td>
-            <td valign="top" width="31%">"Memory exhausted"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">213</td>
-            <td valign="top" width="32%">REG_BADRPT</td>
-            <td valign="top" width="31%">"Invalid preceding regular expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">214</td>
-            <td valign="top" width="32%">REG_EEND</td>
-            <td valign="top" width="31%">"Premature end of regular expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">215</td>
-            <td valign="top" width="32%">REG_ESIZE</td>
-            <td valign="top" width="31%">"Regular expression too big"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">216</td>
-            <td valign="top" width="32%">REG_ERPAREN</td>
-            <td valign="top" width="31%">"Unmatched ) or \\)"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">217</td>
-            <td valign="top" width="32%">REG_EMPTY</td>
-            <td valign="top" width="31%">"Empty expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">218</td>
-            <td valign="top" width="32%">REG_E_UNKNOWN</td>
-            <td valign="top" width="31%">"Unknown error"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>Custom character class names are loaded as followed:&nbsp;</p>
-      <p></p>
-      <table id="Table4" cellspacing="0" cellpadding="7" width="624" border="0">
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">Message ID</td>
-            <td valign="top" width="32%">Description</td>
-            <td valign="top" width="31%">Equivalent default class name</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">300</td>
-            <td valign="top" width="32%">The character class name for alphanumeric characters.</td>
-            <td valign="top" width="31%">"alnum"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">301</td>
-            <td valign="top" width="32%">The character class name for alphabetic characters.</td>
-            <td valign="top" width="31%">"alpha"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">302</td>
-            <td valign="top" width="32%">The character class name for control characters.</td>
-            <td valign="top" width="31%">"cntrl"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">303</td>
-            <td valign="top" width="32%">The character class name for digit characters.</td>
-            <td valign="top" width="31%">"digit"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">304</td>
-            <td valign="top" width="32%">The character class name for graphics characters.</td>
-            <td valign="top" width="31%">"graph"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">305</td>
-            <td valign="top" width="32%">The character class name for lower case characters.</td>
-            <td valign="top" width="31%">"lower"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">306</td>
-            <td valign="top" width="32%">The character class name for printable characters.</td>
-            <td valign="top" width="31%">"print"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">307</td>
-            <td valign="top" width="32%">The character class name for punctuation characters.</td>
-            <td valign="top" width="31%">"punct"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">308</td>
-            <td valign="top" width="32%">The character class name for space characters.</td>
-            <td valign="top" width="31%">"space"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">309</td>
-            <td valign="top" width="32%">The character class name for upper case characters.</td>
-            <td valign="top" width="31%">"upper"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">310</td>
-            <td valign="top" width="32%">The character class name for hexadecimal characters.</td>
-            <td valign="top" width="31%">"xdigit"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">311</td>
-            <td valign="top" width="32%">The character class name for blank characters.</td>
-            <td valign="top" width="31%">"blank"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">312</td>
-            <td valign="top" width="32%">The character class name for word characters.</td>
-            <td valign="top" width="31%">"word"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">313</td>
-            <td valign="top" width="32%">The character class name for Unicode characters.</td>
-            <td valign="top" width="31%">"unicode"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>Finally, custom collating element names are loaded starting from message id 
-         400, and terminating when the first load thereafter fails. Each message looks 
-         something like: "tagname string" where <i>tagname</i> is the name used inside 
-         [[.tagname.]] and <i>string</i> is the actual text of the collating element. 
-         Note that the value of collating element [[.zero.]] is used for the conversion 
-         of strings to numbers - if you replace this with another value then that will 
-         be used for string parsing - for example use the Unicode character 0x0660 for 
-         [[.zero.]] if you want to use Unicode Arabic-Indic digits in your regular 
-         expressions in place of Latin digits.</p>
-      <p>Note that the POSIX defined names for character classes and collating elements 
-         are always available - even if custom names are defined, in contrast, custom 
-         error messages, and custom syntax messages replace the default ones.</p>
-      <p></p>
-      <hr>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/match_flag_type.html b/doc/Attic/match_flag_type.html
deleted file mode 100644
index 64f61402..00000000
--- a/doc/Attic/match_flag_type.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: match_flag_type</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">match_flag_type</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Synopsis</h3>
-      <p>The type <code>match_flag_type</code> is an implementation specific bitmask 
-         type (17.3.2.1.2) that controls how a regular expression is matched against a 
-         character sequence.&nbsp; The behavior of the format flags is described in more 
-         detail in the <A href="format_syntax.html">format syntax guide</A>.</p>
-      <pre>
-namespace boost{ namespace regex_constants{
-
-typedef <EM>implemenation-specific-bitmask-type</EM> match_flag_type;
-
-static const match_flag_type match_default = 0;
-static const match_flag_type match_not_bob;
-static const match_flag_type match_not_eob;
-static const match_flag_type match_not_bol;
-static const match_flag_type match_not_eol;
-static const match_flag_type match_not_bow;
-static const match_flag_type match_not_eow;
-static const match_flag_type match_any;
-static const match_flag_type match_not_null;
-static const match_flag_type match_continuous;
-static const match_flag_type match_partial;
-static const match_flag_type match_single_line;
-static const match_flag_type match_prev_avail;
-static const match_flag_type match_not_dot_newline;
-static const match_flag_type match_not_dot_null;
-
-static const match_flag_type format_default = 0;
-static const match_flag_type format_sed;
-static const match_flag_type format_perl;
-static const match_flag_type format_literal; <BR>
-static const match_flag_type format_no_copy;
-static const match_flag_type format_first_only;
-static const match_flag_type format_all;
-
-} // namespace regex_constants
-} // namespace boost
-</pre>
-      <h3>Description</h3>
-      <p>The type <code>match_flag_type</code> is an implementation specific bitmask 
-         type (17.3.2.1.2). When matching a regular expression against a sequence of 
-         characters [first, last) then setting its elements has the effects listed in 
-         the table below:</p>
-      <p></p>
-      <table id="Table2" cellspacing="1" cellpadding="7" width="100%" border="0">
-         <tr>
-            <td valign="top" width="50%">
-               <p><STRONG>Element</STRONG></p>
-            </td>
-            <td valign="top" width="50%">
-               <p><STRONG>Effect if set</STRONG></p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_default</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that matching of regular expressions proceeds without any 
-                  modification of the normal rules used in ECMA-262, ECMAScript Language 
-                  Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects (FWD.1)</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_bob</td>
-            <td valign="top" width="50%">Specifies that the expressions "\A" and 
-               "\`"&nbsp;should not match against the sub-sequence [first,first).</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_eob</td>
-            <td valign="top" width="50%">Specifies that the expressions "\'", "\z" and 
-               "\Z"&nbsp;should not match against the sub-sequence [last,last).</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_bol</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression "^" should not be matched against the 
-                  sub-sequence [first,first).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_eol</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression "$" should not be matched against the 
-                  sub-sequence [last,last).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_bow</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expressions "\&lt;" and&nbsp;"\b" should not be matched 
-                  against the sub-sequence [first,first).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_eow</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expressions "\&gt;" and&nbsp;"\b" should not be matched 
-                  against the sub-sequence [last,last).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_any</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that if more than one match is possible then any match is an 
-                  acceptable result: this will still find the leftmost match, but may not find 
-                  the "best" match at that position.&nbsp; Use this flag if you care about the 
-                  speed of matching, but don't care what was matched (only whether there is one 
-                  or not).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_null</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression can not be matched against an empty sequence.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_continuous</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression must match a sub-sequence that begins at <i>first</i>.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_partial</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that if no match can be found, then it is acceptable to return a 
-                  match [from, last) such that from!= last, if there could exist some longer 
-                  sequence of characters [from,to) of which [from,last) is a prefix, and which 
-                  would result in a full match.</p>
-               <P>This flag is used when matching incomplete or very long texts, see the <A href="partial_matches.html">
-                     partial matches documentation</A> for more information.</P>
-            </td>
-         </tr>
-         <TR>
-            <TD vAlign="top" width="50%">match_extra</TD>
-            <TD vAlign="top" width="50%">Instructs the matching engine to retain all available <A href="captures.html">
-                  capture</A> information; if a capturing group is repeated then information 
-               about every repeat is available via <A href="match_results.html#m17">match_results::captures()</A>
-               or <A href="sub_match.html#m8">sub_match_captures().</A></TD>
-         </TR>
-         <TR>
-            <TD vAlign="top" width="50%">match_single_line</TD>
-            <TD vAlign="top" width="50%">Equivalent to the inverse of Perl's m/ modifier; 
-               prevents ^ from matching after an embedded newline character (so that it only 
-               matches at the start of the text being matched), and $ from matching before an 
-               embedded newline (so that it only matches at the end of the text being 
-               matched).</TD>
-         </TR>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_prev_avail</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that <code>--first</code> is a valid iterator position, when this 
-                  flag is set then the flags <code>match_not_bol</code> and <code>match_not_bow</code>
-                  are ignored by the regular expression algorithms (RE.7) and iterators (RE.8).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_dot_newline</td>
-            <td valign="top" width="50%">Specifies that the expression "." does not match a 
-               newline character.&nbsp; This is the inverse of Perl's s/ modifier.</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_dot_null</td>
-            <td valign="top" width="50%">Specified that the expression "." does not match a 
-               character null '\0'.</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_default</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that when a regular expression match is to be replaced by a new 
-                  string, that the new string is constructed using the rules used by the 
-                  ECMAScript replace function in ECMA-262, ECMAScript Language Specification, 
-                  Chapter 15 part 5.4.11 String.prototype.replace. (FWD.1). In addition during 
-                  search and replace operations then all non-overlapping occurrences of the 
-                  regular expression are located and replaced, and sections of the input that did 
-                  not match the expression, are copied unchanged to the output string.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_sed</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that when a regular expression match is to be replaced by a new 
-                  string, that the new string is constructed using the rules used by the Unix sed 
-                  utility in IEEE Std 1003.1-2001, Portable Operating SystemInterface (POSIX ), 
-                  Shells and Utilities..</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_perl</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>
-                  Specifies that when a regular expression match is to be replaced by a new 
-                  string, that the new string is constructed using the same rules as Perl 5.</p>
-            </td>
-         </tr>
-         <TR>
-            <TD vAlign="top" width="50%">format_literal</TD>
-            <TD vAlign="top" width="50%">Specified that when a regular expression match is to 
-               be replaced by a new string, that the new string is a literal copy of the 
-               replacement text.</TD>
-         </TR>
-         <tr>
-            <td valign="top" width="50%" height="32">format_all</td>
-            <td valign="top" width="50%" height="32">Specifies that all syntax extensions are 
-               enabled, including conditional (?ddexpression1:expression2) replacements: see 
-               the <A href="format_syntax.html">format string guide</A> for more details.</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_no_copy</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>When specified during a search and replace operation, then sections of the 
-                  character container sequence being searched that do match the regular 
-                  expression, are not copied to the output string.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_first_only</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>When specified during a search and replace operation, then only the first 
-                  occurrence of the regular expression is replaced.</p>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p></p>
-      <hr>
-      <br>
-      <br>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/match_results.html b/doc/Attic/match_results.html
deleted file mode 100644
index 6634b90a..00000000
--- a/doc/Attic/match_results.html
+++ /dev/null
@@ -1,459 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: class match_results</title>
-      <meta content="HTML Tidy, see www.w3.org" name="generator">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <p></p>
-      <table id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-         <tr>
-            <td vAlign="top" width="300">
-               <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class match_results</h2>
-            </td>
-            <td width="50">
-               <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Contents</h3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#description">Description</A> </dt>
-      </dl>
-      <h3><a name="synopsis"></a>Synopsis</h3>
-      <p>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt;</p>
-      <p>Regular expressions are different from many simple pattern-matching algorithms 
-         in that as well as finding an overall match they can also produce 
-         sub-expression matches: each sub-expression being delimited in the pattern by a 
-         pair of parenthesis (...). There has to be some method for reporting 
-         sub-expression matches back to the user: this is achieved this by defining a 
-         class <i>match_results</i> that acts as an indexed collection of sub-expression 
-         matches, each sub-expression match being contained in an object of type <i><A href="sub_match.html">
-               sub_match</A></i> .</p>
-      <p>Template class match_results denotes a collection of character sequences 
-         representing the result of a regular expression match. Objects of type 
-         match_results are passed to the algorithms <A href="regex_match.html">regex_match</A>
-         and <A href="regex_search.html">regex_search</A>, and are returned by the 
-         iterator <A href="regex_iterator.html">regex_iterator</A> .&nbsp; Storage for 
-         the collection is allocated and freed as necessary by the member functions of 
-         class match_results.</p>
-      <p>The template class match_results conforms to the requirements of a Sequence, as 
-         specified in (lib.sequence.reqmts), except that only operations defined for 
-         const-qualified Sequences are supported.</p>
-      <p>Class template match_results is most commonly used as one of the typedefs 
-         cmatch, wcmatch, smatch, or wsmatch:</p>
-      <pre>template &lt;class BidirectionalIterator,
-          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
-class match_results;
-
-typedef match_results&lt;const char*&gt; cmatch;
-typedef match_results&lt;const wchar_t*&gt; wcmatch;
-typedef match_results&lt;string::const_iterator&gt; smatch;
-typedef match_results&lt;wstring::const_iterator&gt; wsmatch;
-
-template &lt;class BidirectionalIterator,
-          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
-class match_results
-{ 
-public: 
-   typedef          sub_match&lt;BidirectionalIterator&gt;                        value_type;
-   typedef          const value_type&amp;                                       const_reference;
-   typedef          const_reference                                         reference;
-   typedef          implementation defined                                  const_iterator;
-   typedef          const_iterator                                          iterator;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
-   typedef typename Allocator::size_type                                    size_type;
-   typedef          Allocator                                               allocator_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::value_type      char_type;
-   typedef          basic_string&lt;char_type&gt;                                 string_type;
-
-   // construct/copy/destroy:
-   explicit <A href="#c1" >match_results</A>(const Allocator&amp; a = Allocator());
-   <A href="#c2" >match_results</A>(const match_results&amp; m);
-   <A href="#c3" >match_results</A>&amp; <A href="#c3" >operator</A>=(const match_results&amp; m); 
-   ~match_results();
-
-   // size:
-   size_type <A href="#m1" >size</A>() const;
-   size_type <A href="#m2" >max_size</A>() const;
-   bool <A href="#m3" >empty</A>() const;
-   // element access:
-   difference_type <A href="#m4" >length</A>(int sub = 0) const;
-   difference_type <A href="#m5" >position</A>(unsigned int sub = 0) const;
-   string_type <A href="#m6" >str</A>(int sub = 0) const;
-   const_reference <A href="#m7" >operator</A>[](int n) const;
-
-   const_reference <A href="#m8" >prefix</A>() const;
-
-   const_reference <A href="#m9" >suffix</A>() const;
-   const_iterator <A href="#m10" >begin</A>() const;
-   const_iterator <A href="#m11" >end</A>() const;
-   // format:
-   template &lt;class OutputIterator&gt;
-   OutputIterator <A href="#m12" >format</A>(OutputIterator out,
-                         const string_type&amp; fmt,
-                         match_flag_type flags = format_default) const;
-   string_type <A href="#m13" >format</A>(const string_type&amp; fmt,
-                      match_flag_type flags = format_default) const;
-
-   allocator_type <A href="#m14" >get_allocator</A>() const;
-   void <A href="#m15" >swap</A>(match_results&amp; that);
-
-#ifdef BOOST_REGEX_MATCH_EXTRA
-   typedef typename value_type::capture_sequence_type <A href="#m16" >capture_sequence_type</A>;
-   const capture_sequence_type&amp; <A href="#m17" >captures</A>(std::size_t i)const;
-#endif
-
-};
-
-template &lt;class BidirectionalIterator, class Allocator&gt;
-bool <A href="#n1" >operator</A> == (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);
-template &lt;class BidirectionalIterator, class Allocator&gt;
-bool <A href="#n2" >operator</A> != (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);
-
-template &lt;class charT, class traits, class BidirectionalIterator, class Allocator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   <A href="#n3" >operator</A> &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os,
-                const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m);
-
-template &lt;class BidirectionalIterator, class Allocator&gt;
-void <A href="#n4" >swap</A>(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-          match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);
-</pre>
-      <h3><a name="description"></a>Description</h3>
-      <h4>match_results constructors</h4>
-      <p>In all <code>match_results</code> constructors, a copy of the Allocator 
-         argument is used for any memory allocation performed by the constructor or 
-         member functions during the lifetime of the object.</p>
-      <pre><A name=c1></A>
-match_results(const Allocator&amp; a = Allocator());
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Constructs an object of class match_results. The postconditions 
-         of this function are indicated in the table:</p>
-      <p align="center"></p>
-      <center>
-         <table id="Table2" cellSpacing="1" cellPadding="7" width="624" border="1">
-            <tbody>
-               <tr>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Element</b></p>
-                  </td>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Value</b></p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>empty()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>true</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>size()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>0</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>str()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>basic_string&lt;charT&gt;()</p>
-                  </td>
-               </tr>
-            </tbody></table>
-      </center>
-      <p>&nbsp;</p>
-      <pre><A name=c2></A>
-match_results(const match_results&amp; m);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Constructs an object of class match_results, as a copy of m.</p>
-      <pre><A name=c3></A>
-match_results&amp; operator=(const match_results&amp; m);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Assigns m to *this. The postconditions of this function are 
-         indicated in the table:</p>
-      <p align="center"></p>
-      <center>
-         <table id="Table3" cellSpacing="1" cellPadding="7" width="624" border="1">
-            <tbody>
-               <tr>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Element</b></p>
-                  </td>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Value</b></p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>empty()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.empty().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>size()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>str(n)</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.str(n) for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>prefix()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.prefix().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>suffix()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.suffix().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>(*this)[n]</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m[n] for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>length(n)</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.length(n) for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>position(n)</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.position(n) for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-            </tbody></table>
-      </center>
-      <h4>match_results size</h4>
-      <pre><A name=m1></A>
-size_type size()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the number of sub_match elements stored in *this; that 
-         is the number of marked sub-expressions in the regular expression that was 
-         matched plus one.</p>
-      <pre><A name=m2></A>
-size_type max_size()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the maximum number of sub_match elements that can be 
-         stored in *this.</p>
-      <pre><A name=m3></A>
-bool empty()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns <code>size() == 0</code>.</p>
-      <h4>match_results element access</h4>
-      <pre><A name=m4></A>
-difference_type length(int sub = 0)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the length of sub-expression <EM>sub</EM>, that is to 
-         say: <code>(*this)[sub].length()</code>.</p>
-      <pre><A name=m5></A>
-difference_type position(unsigned int sub = 0)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the starting location of sub-expression <EM>sub</EM>, 
-         or -1 if <EM>sub</EM> was not matched.&nbsp; Note that if this represents a <A href="partial_matches.html">
-            partial match</A> , then <code>position()</code> will return the location of 
-         the partial match even though <code>(*this)[0].matched</code> is <EM>false</EM>.</p>
-      <pre><A name=m6></A>
-string_type str(int sub = 0)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns sub-expression <EM>sub</EM> as a string:&nbsp; <code>string_type((*this)[sub]).</code></p>
-      <pre><A name=m7></A>
-const_reference operator[](int n) const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a reference to the <code>sub_match</code> object 
-         representing the character sequence that matched marked sub-expression <i>n</i>. 
-         If <code>n == 0</code> then returns a reference to a <code>sub_match</code> object 
-         representing the character sequence that matched the whole regular 
-         expression.&nbsp; If <EM>n</EM> is out of range, or if <EM>n</EM> is an 
-         unmatched sub-expression, then returns a sub_match object whose <EM>matched</EM>
-         member is <EM>false</EM>.</p>
-      <pre><A name=m8></A>
-const_reference prefix()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a reference to the <code>sub_match</code> object 
-         representing the character sequence from the start of the string being 
-         matched/searched, to the start of the match found.</p>
-      <pre><A name=m9></A>
-const_reference suffix()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a reference to the <code>sub_match</code> object 
-         representing the character sequence from the end of the match found to the end 
-         of the string being matched/searched.</p>
-      <pre><A name=m10></A>
-const_iterator begin()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a starting iterator that enumerates over all the marked 
-         sub-expression matches stored in *this.</p>
-      <pre><A name=m11></A>
-const_iterator end()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a terminating iterator that enumerates over all the 
-         marked sub-expression matches stored in *this.</p>
-      <h4><A name="format"></A>match_results reformatting</h4>
-      <pre><A name=m12></A>template &lt;class OutputIterator&gt;
-OutputIterator format(OutputIterator out,
-                      const string_type&amp; fmt,
-                      <A href="match_flag_type.html" >match_flag_type</A> flags = format_default);
-</pre>
-      <b></b>
-      <p><b>Requires:</b> The type OutputIterator conforms to the Output Iterator 
-         requirements (24.1.2).</p>
-      <b></b>
-      <p><b>Effects:</b> Copies the character sequence <i>[fmt.begin(), fmt.end())</i> to 
-         OutputIterator <i>out</i>. For each format specifier or escape sequence in <i>fmt</i>, 
-         replace that sequence with either the character(s) it represents, or the 
-         sequence of characters within *this to which it refers. The bitmasks specified 
-         in <i><A href="match_flag_type.html">flags</A></i> determines what <A href="format_syntax.html">
-            format specifiers or escape sequences are recognized</A>, by default this is 
-         the format used by ECMA-262, ECMAScript Language Specification, Chapter 15 part 
-         5.4.11 String.prototype.replace.</p>
-      <b></b>
-      <p><b>Returns:</b> <i>out</i>.</p>
-      <pre><A name=m13></A>
-string_type format(const string_type&amp; fmt,
-                   <A href="match_flag_type.html" >match_flag_type</A> flags = format_default);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a copy of the string <i>fmt</i>. For each format 
-         specifier or escape sequence in <i>fmt</i>, replace that sequence with either 
-         the character(s) it represents, or the sequence of characters within *this to 
-         which it refers. The bitmasks specified in <i><A href="match_flag_type.html">flags</A></i>
-         determines what <A href="format_syntax.html">format specifiers or escape sequences 
-            are recognized</A>, by default this is the format used by ECMA-262, 
-         ECMAScript Language Specification, Chapter 15 part 5.4.11 
-         String.prototype.replace.</p>
-      <H4>Allocator access</H4>
-      <pre><A name=m14>allocator_type get_allocator()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a copy of the Allocator that was passed to the object's 
-         constructor.</p>
-      <H4><A name="m15"></A>Swap</H4>
-      <PRE>void swap(match_results&amp; that);
-</PRE>
-      <b></b>
-      <p><b>Effects:</b> Swaps the contents of the two sequences.</p>
-      <b></b>
-      <p><b>Postcondition:</b> <code>*this</code> contains the sequence of matched 
-         sub-expressions that were in <code>that</code>, <code>that</code> contains the 
-         sequence of matched sub-expressions that were in <code>*this</code>.</p>
-      <b></b>
-      <p><b>Complexity:</b> constant time.</p>
-      <H4>Captures</H4>
-      <PRE><A name=m16></A>typedef typename value_type::capture_sequence_type capture_sequence_type;</PRE>
-      <P>Defines an implementation-specific type that&nbsp;satisfies the requirements of 
-         a standard library Sequence (21.1.1 including the optional Table 68 
-         operations),&nbsp;whose value_type is a <EM>sub_match&lt;BidirectionalIterator&gt;</EM>.&nbsp;This 
-         type happens to be <EM>std::vector&lt;sub_match&lt;BidirectionalIterator&gt; &gt;</EM>, 
-         but you shouldn't actually rely on that.</P>
-      <PRE><A name=m17></A>const capture_sequence_type&amp; <A href="#m8" >captures</A>(std::size_t i)const; </PRE>
-      <P><STRONG>Effects:</STRONG> returns a sequence containing all the captures 
-         obtained for sub-expression <EM>i</EM>.</P>
-      <P><STRONG>Returns:</STRONG> <code>(*this)[i].captures();</code></P>
-      <P><STRONG>Preconditions:</STRONG> the library must be built and used with 
-         BOOST_REGEX_MATCH_EXTRA defined, and you must pass the flag <A href="match_flag_type.html">
-            match_extra</A> to the regex matching functions (<A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, <A href="regex_iterator.html">regex_iterator</A>
-         or <A href="regex_token_iterator.html">regex_token_iterator</A>) in order for 
-         this member function to be defined and return useful information.</P>
-      <P><STRONG>Rationale:</STRONG> Enabling this feature has several consequences:
-      </P>
-      <UL>
-         <LI>
-         sub_match occupies more memory resulting in complex expressions running out of 
-         memory or stack space more quickly during matching.
-         <LI>
-         The matching algorithms are less efficient at handling some features 
-         (independent sub-expressions for example), even when match_extra is not used.
-         <LI>
-            The matching algorithms are much less efficient (i.e. slower), when match_extra 
-            is used.&nbsp; Mostly this is down to the extra memory allocations that have to 
-            take place.</LI></UL>
-      <h4>match_results non-members</h4>
-      <PRE><A name=n1></A>template &lt;class BidirectionalIterator, class Allocator&gt;
-bool operator == (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);</PRE>
-      <P><B>Effects:</B> Compares the two sequences for equality.</P>
-      <PRE><A name=n2></A>template &lt;class BidirectionalIterator, class Allocator&gt;
-bool operator != (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);</PRE>
-      <P><B>Effects:</B> Compares the two sequences for inequality.</P>
-      <PRE><A name=n3></A>template &lt;class charT, class traits, class BidirectionalIterator, class Allocator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   operator &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os,
-                const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m);</PRE>
-      <P><B>Effects:</B> Writes the contents of <EM>m</EM> to the stream <EM>os</EM> as 
-         if by calling <code>os &lt;&lt; m.str();</code> Returns <EM>os</EM>..</P>
-      <PRE><A name=n4></A>template &lt;class BidirectionalIterator, class Allocator&gt;
-void swap(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-          match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);</PRE>
-      <P><B>Effects:</B> Swaps the contents of the two sequences.</P>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/mfc_strings.html b/doc/Attic/mfc_strings.html
deleted file mode 100644
index f1d733b7..00000000
--- a/doc/Attic/mfc_strings.html
+++ /dev/null
@@ -1,294 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Working With MFC/ATL String Types</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Working With MFC/ATL String Types.</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#intro">Introduction</A> <dt><A href="#types">Types</A> <dt><A href="#create">Regular 
-                     Expression Creation</A> <dt><A href="#algo">Overloaded Algorithms</A>
-                     <dd>
-                        <dl>
-                           <dt><A href="#regex_match">regex_match</A> <dt><A href="#regex_search">regex_search</A>
-                                 <dt><A href="#regex_replace">regex_replace</A> </dt>
-                        </dl>
-                        <dt><A href="#iterators">Iterators</A>
-                           <dd>
-                              <dl>
-                                 <dt><A href="#regex_iterator">regex_iterator creation helper</A> <dt><A href="#regex_token_iterator">
-                                          regex_token_iterator creation helpers</A></dt>
-                              </dl>
-                           </dd>
-      </dl>
-      <H3><a name="intro"></a>Introduction</H3>
-      <P>The header &lt;boost/regex/mfc.hpp&gt; provides Boost.Regex support for MFC 
-         string types: note that this support requires Visual Studio .NET (Visual C++ 7) 
-         or later, where all of the MFC and ATL string types are based around 
-         the&nbsp;CSimpleStringT class template.&nbsp;</P>
-      <P>In the following documentation, whenever you see CSimpleStringT&lt;charT&gt;, 
-         then you can substitute any of the following MFC/ATL types (all of which 
-         inherit from&nbsp;CSimpleStringT):</P>
-      <P>CString<BR>
-         CStringA<BR>
-         CStringW<BR>
-         CAtlString<BR>
-         CAtlStringA<BR>
-         CAtlStringW<BR>
-         CStringT&lt;charT,traits&gt;<BR>
-         CFixedStringT&lt;charT,N&gt;<BR>
-         CSimpleStringT&lt;charT&gt;</B></P>
-      <H3><A name="types"></A>Types</H3>
-      <P>The following typedefs are provided for the convenience of those working with 
-         TCHAR's:</P>
-      <PRE>typedef <A href="basic_regex.html" >basic_regex</A>&lt;TCHAR&gt; tregex; 
-typedef <A href="match_results.html" >match_results</A>&lt;TCHAR const*&gt; tmatch; 
-typedef <A href="regex_iterator.html" >regex_iterator</A>&lt;TCHAR const*&gt; tregex_iterator; 
-typedef <A href="regex_token_iterator.html" >regex_token_iterator</A>&lt;TCHAR const*&gt; tregex_token_iterator; 
-</PRE>
-      <P>If you are working with explicitly narrow or wide characters rather than TCHAR, 
-         then use the regular Boost.Regex types instead.</P>
-      <H3><A name="create"></A>Regular Expression Creation</H3>
-      <P>The following helper function is available to assist in the creation of a 
-         regular expression from an MFC/ATL string type:</P>
-      <pre>template &lt;class charT&gt;
-basic_regex&lt;charT&gt; 
-   make_regex(const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-              ::boost::regex_constants::syntax_option_type f = boost::regex_constants::normal);</pre>
-      <P><STRONG>Effects</STRONG>: returns basic_regex&lt;charT&gt;(s.GetString(), 
-         s.GetString() + s.GetLength(), f);</P>
-      <H3><A name="algo"></A>Overloaded Algorithms</H3>
-      <P>For each regular expression algorithm that's overloaded for a std::basic_string 
-         argument, there is also one overloaded for the MFC/ATL string types.&nbsp; 
-         These algorithm signatures&nbsp;all look a lot more complex than they actually 
-         are, but for completeness here they are anyway:</P>
-      <H4><A name="regex_match"></A>regex_match</H4>
-      <P>There are two overloads, the first reports what matched in a match_results 
-         structure, the second does not.&nbsp;
-      </P>
-      <P>All the usual caveats for <A href="regex_match.html">regex_match</A> apply, in 
-         particular the algorithm will only report a successful match if <STRONG>all of the 
-            input text matches the expression</STRONG>, if this isn't what you want then 
-         use <A href="regex_search.html">regex_search</A> instead.</P>
-      <PRE>template &lt;class charT, class T, class A&gt;
-bool regex_match(
-   const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-   match_results&lt;const B*, A&gt;&amp; what, 
-   const basic_regex&lt;charT, T&gt;&amp; e, 
-   boost::regex_constants::match_flag_type f = boost::regex_constants::match_default); </PRE>
-      <P>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_match.html">regex_match</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), what, e, f);</P>
-      <p><strong>Example:</strong></p>
-      <pre>//
-// Extract filename part of a path from a CString and return the result
-// as another CString:
-//
-CString get_filename(const CString&amp; 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));
-   }
-   else
-   {
-      throw std::runtime_error("Invalid pathname");
-   }
-}
-      </pre>
-      <hr>
-      <PRE>template &lt;class charT, class T&gt;
-bool regex_match(
-   const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-   const basic_regex&lt;B, T&gt;&amp; e,
-   boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)</PRE>
-      <P>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_match.html">regex_match</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, f);</P>
-      <p><strong>Example:</strong></p>
-      <pre>//
-// Find out if *password* meets our password requirements,
-// as defined by the regular expression *requirements*.
-//
-bool is_valid_password(const CString&amp; password, const CString&amp; requirements)
-{
-   return boost::regex_match(password, boost::make_regex(requirements));
-}      </pre>
-      <hr>
-      <H4><A name="regex_search"></A>regex_search</H4>
-      <P>There are two additional overloads for <A href="regex_search.html">regex_search</A>, 
-         the first reports what matched the second does not:</P>
-      <PRE>template &lt;class charT, class A, class T&gt;
-bool regex_search(const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-                  match_results&lt;const charT*, A&gt;&amp; what,
-                  const basic_regex&lt;charT, T&gt;&amp; e,
-                  boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)</PRE>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_search.html">regex_search</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), what, e, f);</P>
-      <P><STRONG>Example:</STRONG>: Postcode extraction from an address string.</P>
-      <pre>CString extract_postcode(const CString&amp; 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})$"));
-   boost::tmatch what;
-   if(boost::regex_search(address, what, r))
-   {
-      // extract $0 as a CString:
-      return CString(what[0].first, what.length());
-   }
-   else
-   {
-      throw std::runtime_error("No postcode found");
-   }
-}      </pre>
-      <hr>
-      <pre>template &lt;class charT, class T&gt;
-inline bool regex_search(const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-                 const basic_regex&lt;charT, T&gt;&amp; e,
-                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
-</pre>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_search.html">regex_search</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, f);</P>
-      <hr>
-      <H4><A name="regex_replace"></A>regex_replace</H4>
-      <P>There are two additional overloads for <A href="regex_replace.html">regex_replace</A>, 
-         the first sends output to an output iterator, while the second creates a new 
-         string</P>
-      <PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class
-          charT&gt;
-OutputIterator regex_replace(OutputIterator out,
-                           BidirectionalIterator first,
-                           BidirectionalIterator last,
-                           const basic_regex&lt;charT, traits&gt;&amp; e,
-                           const ATL::CSimpleStringT&lt;charT&gt;&amp; fmt,
-                           match_flag_type flags = match_default)
-</PRE>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_replace.html">regex_replace</A>(out, 
-         first, last, e, fmt.GetString(), flags);</P>
-      <pre>template &lt;class traits, charT&gt;
-ATL::CSimpleStringT&lt;charT&gt; regex_replace(const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-                            const basic_regex&lt;charT, traits&gt;&amp; e,
-                            const ATL::CSimpleStringT&lt;charT&gt;&amp; fmt,
-                            match_flag_type flags = match_default)</pre>
-      <P><STRONG>Effects</STRONG>: returns a new string created using <A href="regex_replace.html">
-            regex_replace</A>, and the same memory manager as string <EM>s</EM>.</P>
-      <P><STRONG>Example:</STRONG></P>
-      <PRE>//
-// 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&amp; s)
-{
-   return boost::regex_replace(s, e, human_format);
-}
-      </PRE>
-      <H3><a name="iterators"></a>Iterators</H3>
-      <P>The following helper functions are provided to ease the conversion from an 
-         MFC/ATL string to a <A href="regex_iterator.html">regex_iterator</A> or <A href="regex_token_iterator.html">
-            regex_token_iterator</A>:</P>
-      <H4><A name="regex_iterator"></A>regex_iterator creation helper</H4>
-      <PRE>template &lt;class charT&gt;
-regex_iterator&lt;charT const*&gt; 
-   make_regex_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</PRE>
-      <p><STRONG>Effects:</STRONG>returns <A href="regex_iterator.html">regex_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, f);</p>
-      <p><strong>Example:</strong></p>
-      <pre>void enumerate_links(const CString&amp; html)
-{
-   // enumerate and print all the <a> links in some HTML text,
-   // the expression used is by Andew Lee on <a href="http://www.regxlib.com">www.regxlib.com</a>:
-   boost::tregex r(__T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*(\\/|\\?\\w*=\\w*(&amp;\\w*=\\w*)*)?)[\"\']"));
-   boost::tregex_iterator i(boost::make_regex_iterator(html, r)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; (*i)[1] &lt;&lt; std::endl;
-      ++i;
-   }
-}
-      </pre>
-      <hr>
-      <H4><A name="regex_token_iterator"></A>regex_token_iterator creation helpers</H4>
-      <PRE>template &lt;class charT&gt; 
-regex_token_iterator&lt;charT const*&gt; 
-   make_regex_token_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      int sub = 0, 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</PRE>
-      <p><STRONG>Effects:</STRONG>returns <A href="regex_token_iterator.html">regex_token_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, sub, f);</p>
-      <pre>template &lt;class charT&gt; 
-regex_token_iterator&lt;charT const*&gt; 
-   make_regex_token_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      const std::vector&lt;int&gt;&amp; subs, 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</pre>
-      <p><STRONG>Effects:</STRONG>returns <A href="regex_token_iterator.html">regex_token_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, subs, f);</p>
-      <pre>template &lt;class charT, std::size_t N&gt; 
-regex_token_iterator&lt;charT const*&gt; 
-   make_regex_token_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      const int (&amp; subs)[N], 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</pre>
-      <p><STRONG>Effects: </STRONG>returns <A href="regex_token_iterator.html">regex_token_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, subs, f);</p>
-      <P><STRONG>Example:</STRONG></P>
-      <PRE>void enumerate_links2(const CString&amp; html)
-{
-   // enumerate and print all the <a> links in some HTML text,
-   // the expression used is by Andew Lee on <a href="http://www.regxlib.com">www.regxlib.com</a>:
-   boost::tregex r(__T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*(\\/|\\?\\w*=\\w*(&amp;\\w*=\\w*)*)?)[\"\']"));
-   boost::tregex_token_iterator i(boost::make_regex_token_iterator(html, r, 1)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; *i &lt;&lt; std::endl;
-      ++i;
-   }
-}      </PRE>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21&nbsp;Dec 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/non_standard_strings.html b/doc/Attic/non_standard_strings.html
deleted file mode 100644
index 5196abcf..00000000
--- a/doc/Attic/non_standard_strings.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Working With Non-Standard String Types</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Working With Non-Standard String Types.</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The Boost.Regex algorithms and iterators are all iterator-based, with 
-         convenience overloads of the algorithms provided that convert standard library 
-         string types to iterator pairs internally.&nbsp; If you want to search a 
-         non-standard string type then the trick is to convert that string into an 
-         iterator pair: so far I haven't come across any string types that can't be 
-         handled this way, even if they're not officially iterator based.&nbsp; 
-         Certainly any string type that provides access to it's internal buffer, along 
-         with it's length, can be converted into a pair of pointers (which can be used 
-         as iterators).</P>
-      <P>Some non-standard string types are sufficiently common that wappers have been 
-         provided for them:</P>
-      <P><A href="mfc_strings.html">MFC/ATL Strings.</A><BR>
-         <A href="icu_strings.html">ICU Strings.</A></P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/partial_matches.html b/doc/Attic/partial_matches.html
deleted file mode 100644
index f523fc9a..00000000
--- a/doc/Attic/partial_matches.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Partial Matches</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Partial Matches</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The <A href="match_flag_type.html">match-flag</A> <CODE>match_partial</CODE> can 
-         be passed to the following algorithms: <A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, and <A href="regex_grep.html">regex_grep</A>, 
-         and used with the iterator <A href="regex_iterator.html">regex_iterator</A>. 
-         When used it indicates that partial as well as full matches should be found. A 
-         partial match is one that matched one or more characters at the end of the text 
-         input, but did not match all of the regular expression (although it may have 
-         done so had more input been available). Partial matches are typically used when 
-         either validating data input (checking each character as it is entered on the 
-         keyboard), or when searching texts that are either too long to load into memory 
-         (or even into a memory mapped file), or are of indeterminate length (for 
-         example the source may be a socket or similar). Partial and full matches can be 
-         differentiated as shown in the following table (the variable M represents an 
-         instance of <A href="match_results.html">match_results&lt;&gt;</A> as filled in 
-         by regex_match, regex_search or regex_grep):<BR>
-      </P>
-      <P>
-         <TABLE id="Table2" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD vAlign="top" width="20%">&nbsp;</TD>
-               <TD vAlign="top" width="20%">Result</TD>
-               <TD vAlign="top" width="20%">M[0].matched</TD>
-               <TD vAlign="top" width="20%">M[0].first</TD>
-               <TD vAlign="top" width="20%">M[0].second</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="20%">No match</TD>
-               <TD vAlign="top" width="20%">False</TD>
-               <TD vAlign="top" width="20%">Undefined</TD>
-               <TD vAlign="top" width="20%">Undefined</TD>
-               <TD vAlign="top" width="20%">Undefined</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="20%">Partial match</TD>
-               <TD vAlign="top" width="20%">True</TD>
-               <TD vAlign="top" width="20%">False</TD>
-               <TD vAlign="top" width="20%">Start of partial match.</TD>
-               <TD vAlign="top" width="20%">End of partial match (end of text).</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="20%">Full match</TD>
-               <TD vAlign="top" width="20%">True</TD>
-               <TD vAlign="top" width="20%">True</TD>
-               <TD vAlign="top" width="20%">Start of full match.</TD>
-               <TD vAlign="top" width="20%">End of full match.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Be aware that using partial matches can sometimes result in somewhat imperfect 
-         behavior:</P>
-      <UL>
-         <LI>
-            There are some expressions, such as ".*abc" that will always produce a partial 
-            match.&nbsp; 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.</LI>
-         <LI>
-            Boost.Regex currently prefers leftmost matches to full matches, so for example 
-            matching "abc|b" against "ab" produces a partial match&nbsp;against the "ab" 
-            rather than a full match against "b".&nbsp; It's more efficient to work this 
-            way, but may not be the behavior you want in all situations.</LI></UL>
-      <P>The following <A href="../example/snippets/partial_regex_match.cpp">example</A> 
-         tests to see whether the text could be a valid credit card number, as the user 
-         presses a key, the character entered would be added to the string being built 
-         up, and passed to <CODE>is_possible_card_number</CODE>. If this returns true 
-         then the text could be a valid card number, so the user interface's OK button 
-         would be enabled. If it returns false, then this is not yet a valid card 
-         number, but could be with more input, so the user interface would disable the 
-         OK button. Finally, if the procedure throws an exception the input could never 
-         become a valid number, and the inputted character must be discarded, and a 
-         suitable error indication displayed to the user.</P>
-      <PRE>#include &lt;string&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/regex.hpp&gt;
-
-boost::regex e("(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})");
-
-bool is_possible_card_number(const std::string&amp; 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&lt;std::string::const_iterator&gt; 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("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)
-   {
-      // excellent, we have a result:
-      return true;
-   }
-   // what we have so far is only a partial match...
-   return false;
-}</PRE>
-      <P>In the following <A href="../example/snippets/partial_regex_grep.cpp">example</A>, 
-         text input is taken from a stream containing an unknown amount of text; this 
-         example simply counts the number of html tags encountered in the stream. The 
-         text is loaded into a buffer and searched a part at a time, if a partial match 
-         was encountered, then the partial match gets searched a second time as the 
-         start of the next batch of text:</P>
-      <PRE>#include &lt;iostream&gt;
-#include &lt;fstream&gt;
-#include &lt;sstream&gt;
-#include &lt;string&gt;
-#include &lt;boost/regex.hpp&gt;
-
-// match some kind of html tag:
-boost::regex e("&lt;[^&gt;]*&gt;");
-// count how many:
-unsigned int tags = 0;
-// saved position of partial match:
-char* next_pos = 0;
-
-bool grep_callback(const boost::match_results&lt;char*&gt;&amp; m)
-{
-   if(m[0].matched == false)
-   {
-      // save position and return:
-      next_pos = m[0].first;
-   }
-   else
-      ++tags;
-   return true;
-}
-
-void search(std::istream&amp; is)
-{
-   char buf[4096];
-   next_pos = buf + sizeof(buf);
-   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:
-      memcpy(buf, next_pos, leftover);
-      // fill the rest from the stream:
-      unsigned read = is.readsome(buf + leftover, size);
-      // check to see if we've run out of text:
-      have_more = read == size;
-      // reset next_pos:
-      next_pos = buf + sizeof(buf);
-      // and then grep:
-      boost::regex_grep(grep_callback,
-                        buf,
-                        buf + read + leftover,
-                        e,
-                        boost::match_default | boost::match_partial);
-   }
-}</PRE>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/performance.html b/doc/Attic/performance.html
deleted file mode 100644
index c7897ff3..00000000
--- a/doc/Attic/performance.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Performance</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Performance</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The performance of Boost.regex in both recursive and non-recursive modes should 
-         be broadly comparable to other regular expression libraries: recursive mode is 
-         slightly faster (especially where memory allocation requires thread 
-         synchronisation), but not by much.&nbsp; The following pages compare 
-         Boost.regex with various other regular expression libraries for the following 
-         compilers:</P>
-      <P><A href="vc71-performance.html">Visual Studio.Net 2003 (recursive Boost.regex 
-            implementation)</A>.</P>
-      <P><A href="gcc-performance.html">Gcc 3.2 (cygwin) (non-recursive Boost.regex 
-            implementation).</A></P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/posix_api.html b/doc/Attic/posix_api.html
deleted file mode 100644
index 967b8407..00000000
--- a/doc/Attic/posix_api.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: POSIX API Compatibility Functions</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">POSIX API Compatibility Functions</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <PRE>#include &lt;boost/cregex.hpp&gt;
-<I>or</I>:
-#include &lt;boost/regex.h&gt;</PRE>
-      <P>The following functions are available for users who need a POSIX compatible C 
-         library, they are available in both Unicode and narrow character versions, the 
-         standard POSIX API names are macros that expand to one version or the other 
-         depending upon whether UNICODE is defined or not.
-      </P>
-      <P><B>Important</B>: Note that all the symbols defined here are enclosed inside 
-         namespace <I>boost</I> when used in C++ programs, unless you use #include 
-         &lt;boost/regex.h&gt; instead - in which case the symbols are still defined in 
-         namespace boost, but are made available in the global namespace as well.</P>
-      <P>The functions are defined as:
-      </P>
-      <PRE>extern "C" {
-<B>int</B> regcompA(regex_tA*, <B>const</B> <B>char</B>*, <B>int</B>);
-<B>unsigned</B> <B>int</B> regerrorA(<B>int</B>, <B>const</B> regex_tA*, <B>char</B>*, <B>unsigned</B> <B>int</B>);
-<B>int</B> regexecA(<B>const</B> regex_tA*, <B>const</B> <B>char</B>*, <B>unsigned</B> <B>int</B>, regmatch_t*, <B>int</B>);
-<B>void</B> regfreeA(regex_tA*);
-
-<B>int</B> regcompW(regex_tW*, <B>const</B> <B>wchar_t</B>*, <B>int</B>);
-<B>unsigned</B> <B>int</B> regerrorW(<B>int</B>, <B>const</B> regex_tW*, <B>wchar_t</B>*, <B>unsigned</B> <B>int</B>);
-<B>int</B> regexecW(<B>const</B> regex_tW*, <B>const</B> <B>wchar_t</B>*, <B>unsigned</B> <B>int</B>, regmatch_t*, <B>int</B>);
-<B>void</B> regfreeW(regex_tW*);
-
-#ifdef UNICODE
-#define regcomp regcompW
-#define regerror regerrorW
-#define regexec regexecW
-#define regfree regfreeW
-#define regex_t regex_tW
-#else
-#define regcomp regcompA
-#define regerror regerrorA
-#define regexec regexecA
-#define regfree regfreeA
-#define regex_t regex_tA
-#endif
-}</PRE>
-      <P>All the functions operate on structure <B>regex_t</B>, which exposes two public 
-         members:
-      </P>
-      <P><B>unsigned int re_nsub</B> this is filled in by <B>regcomp</B> and indicates 
-         the number of sub-expressions contained in the regular expression.
-      </P>
-      <P><B>const TCHAR* re_endp</B> points to the end of the expression to compile when 
-         the flag REG_PEND is set.
-      </P>
-      <P><I>Footnote: regex_t is actually a #define - it is either regex_tA or regex_tW 
-            depending upon whether UNICODE is defined or not, TCHAR is either char or 
-            wchar_t again depending upon the macro UNICODE.</I>
-      </P>
-      <H3>regcomp</H3>
-      <P><B>regcomp</B> takes a pointer to a <B>regex_t</B>, a pointer to the expression 
-         to compile and a flags parameter which can be a combination of:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table2" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_EXTENDED</TD>
-               <TD vAlign="top" width="45%">Compiles modern regular expressions. Equivalent to 
-                  regbase::char_classes | regbase::intervals | regbase::bk_refs.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_BASIC</TD>
-               <TD vAlign="top" width="45%">Compiles basic (obsolete) regular expression syntax. 
-                  Equivalent to regbase::char_classes | regbase::intervals | regbase::limited_ops 
-                  | regbase::bk_braces | regbase::bk_parens | regbase::bk_refs.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NOSPEC</TD>
-               <TD vAlign="top" width="45%">All characters are ordinary, the expression is a 
-                  literal string.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_ICASE</TD>
-               <TD vAlign="top" width="45%">Compiles for matching that ignores character case.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NOSUB</TD>
-               <TD vAlign="top" width="45%">Has no effect in this library.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NEWLINE</TD>
-               <TD vAlign="top" width="45%">When this flag is set a dot does not match the 
-                  newline character.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_PEND</TD>
-               <TD vAlign="top" width="45%">When this flag is set the re_endp parameter of the 
-                  regex_t structure must point to the end of the regular expression to compile.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NOCOLLATE</TD>
-               <TD vAlign="top" width="45%">When this flag is set then locale dependent collation 
-                  for character ranges is turned off.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_ESCAPE_IN_LISTS<BR>
-                  , , ,
-               </TD>
-               <TD vAlign="top" width="45%">When this flag is set, then escape sequences are 
-                  permitted in bracket expressions (character sets).</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NEWLINE_ALT&nbsp;</TD>
-               <TD vAlign="top" width="45%">When this flag is set then the newline character is 
-                  equivalent to the alternation operator |.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_PERL&nbsp;</TD>
-               <TD vAlign="top" width="45%">Compiles Perl like regular expressions.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_AWK</TD>
-               <TD vAlign="top" width="45%">A shortcut for awk-like behavior: REG_EXTENDED | 
-                  REG_ESCAPE_IN_LISTS</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_GREP</TD>
-               <TD vAlign="top" width="45%">A shortcut for grep like behavior: REG_BASIC | 
-                  REG_NEWLINE_ALT</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_EGREP</TD>
-               <TD vAlign="top" width="45%">&nbsp;A shortcut for egrep like behavior: 
-                  REG_EXTENDED | REG_NEWLINE_ALT</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>regerror</H3>
-      <P>regerror takes the following parameters, it maps an error code to a human 
-         readable string:
-         <BR>
-      </P>
-      <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="50%">int code</TD>
-               <TD vAlign="top" width="50%">The error code.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">const regex_t* e</TD>
-               <TD vAlign="top" width="50%">The regular expression (can be null).</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">char* buf</TD>
-               <TD vAlign="top" width="50%">The buffer to fill in with the error message.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">unsigned int buf_size</TD>
-               <TD vAlign="top" width="50%">The length of buf.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>If the error code is OR'ed with REG_ITOA then the message that results is the 
-         printable name of the code rather than a message, for example "REG_BADPAT". If 
-         the code is REG_ATIO then <B>e</B> must not be null and <B>e-&gt;re_pend</B> must 
-         point to the printable name of an error code, the return value is then the 
-         value of the error code. For any other value of <B>code</B>, the return value 
-         is the number of characters in the error message, if the return value is 
-         greater than or equal to <B>buf_size</B> then <B>regerror</B> will have to be 
-         called again with a larger buffer.</P>
-      <H3>regexec</H3>
-      <P><B>regexec</B> finds the first occurrence of expression <B>e</B> within string <B>buf</B>. 
-         If <B>len</B> is non-zero then *<B>m</B> is filled in with what matched the 
-         regular expression, <B>m[0]</B> contains what matched the whole string, <B>m[1] </B>
-         the first sub-expression etc, see <B>regmatch_t</B> in the header file 
-         declaration for more details. The <B>eflags</B> parameter can be a combination 
-         of:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table4" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="50%">REG_NOTBOL</TD>
-               <TD vAlign="top" width="50%">Parameter <B>buf </B>does not represent the start of 
-                  a line.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">REG_NOTEOL</TD>
-               <TD vAlign="top" width="50%">Parameter <B>buf</B> does not terminate at the end of 
-                  a line.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">REG_STARTEND</TD>
-               <TD vAlign="top" width="50%">The string searched starts at buf + pmatch[0].rm_so 
-                  and ends at buf + pmatch[0].rm_eo.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>regfree</H3>
-      <P>Finally <B>regfree</B> frees all the memory that was allocated by regcomp.
-      </P>
-      <P><I>Footnote: this is an abridged reference to the POSIX API functions, it is 
-            provided for compatibility with other libraries, rather than an API to be used 
-            in new code (unless you need access from a language other than C++). This 
-            version of these functions should also happily coexist with other versions, as 
-            the names used are macros that expand to the actual function names.</I>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/redistributables.html b/doc/Attic/redistributables.html
deleted file mode 100644
index cdad4739..00000000
--- a/doc/Attic/redistributables.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Redistributables and Library Names</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Redistributables and Library Names</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>If you are using Microsoft or Borland C++ and link to a dll version of the run 
-         time library, then you can choose to also link to a dll version of boost.regex 
-         by defining the symbol BOOST_REGEX_DYN_LINK when you compile your code. While 
-         these dll's are redistributable, there are no "standard" versions, so when 
-         installing on the users PC, you should place these in a directory private to 
-         your application, and not in the PC's directory path. Note that if you link to 
-         a static version of your run time library, then you will also link to a static 
-         version of boost.regex and no dll's will need to be distributed. The possible 
-         boost.regex dll and library names are computed according to the <A href="../../../more/getting_started.html#step5">
-            formula given in the getting started guide</A>.
-      </P>
-      <P>Note: you can disable automatic library selection by defining the symbol 
-         BOOST_REGEX_NO_LIB when compiling, this is useful if you want to build 
-         Boost.Regex yourself in your IDE, or if you need to debug boost.regex.
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/reg_expression.html b/doc/Attic/reg_expression.html
deleted file mode 100644
index 15962278..00000000
--- a/doc/Attic/reg_expression.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Class reg_expression (deprecated)</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Class reg_expression (deprecated)</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The use of class template reg_expression is deprecated: use <A href="basic_regex.html">
-            basic_regex</A> instead.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/regbase.html b/doc/Attic/regbase.html
deleted file mode 100644
index e2cf5c54..00000000
--- a/doc/Attic/regbase.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>Boost.Regex: regbase</title>
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<p></p>
-
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../boost.png" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">regbase</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<p>Use of the type <code>boost::regbase</code> is now deprecated,
-and the type does not form a part of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-regular expression standardization proposal</a>.&nbsp; This type
-still exists as a base class of <code>boost::basic_regex</code>,
-and you can still refer to <code>
-boost::regbase::constant_name</code> in your code, however for
-maximum portability to other std regex implementations you should
-instead use either:</p>
-
-<pre>
-boost::regex_constants::constant_name
-</pre>
-
-<p>or</p>
-
-<pre>
-boost::regex::constant_name
-</pre>
-
-<p>or</p>
-
-<pre>
-boost::wregex::constant_name
-</pre>
-
-<p></p>
-
-<hr>
-<br>
-<br>
- 
-
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
-</html>
-
-
diff --git a/doc/Attic/regex.html b/doc/Attic/regex.html
deleted file mode 100644
index 7a5f29de..00000000
--- a/doc/Attic/regex.html
+++ /dev/null
@@ -1,481 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: class RegEx (deprecated)</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class RegEx (deprecated)</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>The high level wrapper class RegEx is now deprecated and does not form a part 
-         of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</a>.&nbsp; This type still exists, and 
-         existing code will continue to compile, however the following documentation is 
-         unlikely to be further updated.</p>
-      <pre>
-#include &lt;boost/cregex.hpp&gt;
-</pre>
-      <p>The class RegEx provides a high level simplified interface to the regular 
-         expression library, this class only handles narrow character strings, and 
-         regular expressions always follow the "normal" syntax - that is the same as the 
-         perl / ECMAScript synatx.</p>
-      <pre>
-<b>typedef</b> <b>bool</b> (*GrepCallback)(<b>const</b> RegEx&amp; expression);
-<b>typedef</b> <b>bool</b> (*GrepFileCallback)(<b>const</b> <b>char</b>* file, <b>const</b> RegEx&amp; expression);
-<b>typedef</b> <b>bool</b> (*FindFilesCallback)(<b>const</b> <b>char</b>* file);
-
-<b>class</b>  RegEx
-{
-<b>public</b>:
-   RegEx();
-   RegEx(<b>const</b> RegEx&amp; o);
-   ~RegEx();
-   RegEx(<b>const</b> <b>char</b>* c, <b>bool</b> icase = <b>false</b>);
-   <strong>explicit</strong> RegEx(<b>const</b> std::string&amp; s, <b>bool</b> icase = <b>false</b>);
-   RegEx&amp; <b>operator</b>=(<b>const</b> RegEx&amp; o);
-   RegEx&amp; <b>operator</b>=(<b>const</b> <b>char</b>* p);
-   RegEx&amp; <b>operator</b>=(<b>const</b> std::string&amp; s);
-   <b>unsigned</b> <b>int</b> SetExpression(<b>const</b> <b>char</b>* p, <b>bool</b> icase = <b>false</b>);
-   <b>unsigned</b> <b>int</b> SetExpression(<b>const</b> std::string&amp; s, <b>bool</b> icase = <b>false</b>);
-   std::string Expression()<b>const</b>;
-   <font color="#000080"><i>//
-</i>   <i>// now matching operators:</i> 
-   <i>//</i></font> 
-   <b>bool</b> Match(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);
-   <b>bool</b> Match(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> char* in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b> max_count = ~0); 
-   <font color="#000080"><i>// 
-</i>   <i>// now operators for returning what matched in more detail: 
-</i>   <i>// 
-</i></font>   <b>unsigned</b> <b>int</b> Position(<b>int</b> i = 0)<b>const</b>; 
-   <b>unsigned</b> <b>int</b> Length(<b>int</b> i = 0)<b>const</b>; 
-   <strong>bool</strong> Matched(<strong>int</strong> i = 0)<strong>const</strong>;
-   <b>unsigned</b> <b>int</b> Line()<b>const</b>; 
-   <b>unsigned int</b> Marks() const; 
-   std::string What(<b>int</b> i)<b>const</b>; 
-   std::string <b>operator</b>[](<b>int</b> i)<b>const</b> ; 
-
-   <strong>static const unsigned int</strong> npos;
-};    
-</pre>
-      <p>Member functions for class RegEx are defined as follows:<br>
-         &nbsp;</p>
-      <p></p>
-      <table id="Table2" cellspacing="0" cellpadding="7" width="100%" border="0">
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx();</td>
-            <td valign="top" width="42%">Default constructor, constructs an instance of RegEx 
-               without any valid expression.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx(<b>const</b> RegEx&amp; o);</td>
-            <td valign="top" width="42%">Copy constructor, all the properties of parameter <i>o</i>
-               are copied.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx(<b>const</b> <b>char</b>* c, <b>bool</b> icase 
-               = <b>false</b>);</td>
-            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-               expression to <i>c</i>, if <i>icase</i> is <i>true</i> then matching is 
-               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-               on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx(<b>const</b> std::string&amp; s, <b>bool</b> icase 
-               = <b>false</b>);</td>
-            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-               expression to <i>s</i>, if <i>icase</i> is <i>true</i> then matching is 
-               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-               on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> RegEx&amp; 
-               o);</td>
-            <td valign="top" width="42%">Default assignment operator.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> <b>char</b>* 
-               p);</td>
-            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(p, 
-                  false).</i> Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> std::string&amp; 
-               s);</td>
-            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(s, 
-                  false).</i> Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>constchar</b>* 
-               p, <b>bool</b> icase = <b>false</b>);</td>
-            <td valign="top" width="42%">Sets the current expression to <i>p</i>, if <i>icase</i>
-               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-               to case. Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>const</b> 
-               std::string&amp; s, <b>bool</b> icase = <b>false</b>);</td>
-            <td valign="top" width="42%">Sets the current expression to <i>s</i>, if <i>icase</i>
-               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-               to case. Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string Expression()<b>const</b>;</td>
-            <td valign="top" width="42%">Returns a copy of the current regular expression.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> <b>char</b>* p, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Attempts to match the current expression against the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-               the input string.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> std::string&amp; s, 
-               boost::match_flag_type flags = match_default) ;</td>
-            <td valign="top" width="42%">Attempts to match the current expression against the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-               the input string.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> <b>char</b>* p, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Attempts to find a match for the current expression 
-               somewhere in the text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> std::string&amp; s, 
-               boost::match_flag_type flags = match_default) ;</td>
-            <td valign="top" width="42%">Attempts to find a match for the current expression 
-               somewhere in the text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-               <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
-               as: cb(*this);
-               <p>If at any stage the call-back function returns false then the grep operation 
-                  terminates, otherwise continues until no further matches are found. Returns the 
-                  number of matches found.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-               std::string&amp; s, boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
-               as: cb(*this);
-               <p>If at any stage the call-back function returns false then the grep operation 
-                  terminates, otherwise continues until no further matches are found. Returns the 
-                  number of matches found.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-               v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
-               Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-               v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = 
-               match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
-               Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-                  int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type 
-               flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes the starting index of what matched 
-               onto <i>v</i>. Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-                  int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type 
-               flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes the starting index of what matched 
-               onto <i>v</i>. Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  further matches in the current file, or any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of matches found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  further matches in the current file, or any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of matches found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
-               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
-               at least one match of the current expression using the match flags <i>flags</i> 
-               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
-               calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of files found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
-               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
-               at least one match of the current expression using the match flags <i>flags</i> 
-               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
-               calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of files found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string Merge(<b>const</b> std::string&amp; in, <b>const</b>
-               std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type 
-               flags = match_default);</td>
-            <td valign="top" width="42%">Performs a search and replace operation: searches 
-               through the string <i>in</i> for all occurrences of the current expression, for 
-               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
-               to determine what gets matched, and how the format string should be treated. If <i>
-                  copy</i> is true then all unmatched sections of input are copied unchanged 
-               to output, if the flag <em>format_first_only</em> is set then only the first 
-               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
-                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
-               and <a href="match_flag_type.html">format flags</a>.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string Merge(<b>const</b> char* in, <b>const</b> 
-               char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = 
-               match_default);</td>
-            <td valign="top" width="42%">Performs a search and replace operation: searches 
-               through the string <i>in</i> for all occurrences of the current expression, for 
-               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
-               to determine what gets matched, and how the format string should be treated. If <i>
-                  copy</i> is true then all unmatched sections of input are copied unchanged 
-               to output, if the flag <em>format_first_only</em> is set then only the first 
-               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
-                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
-               and <a href="match_flag_type.html">format flags</a>.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top"><b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, 
-               std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b>
-               max_count = ~0);</td>
-            <td valign="top">Splits the input string and pushes each one onto the vector. If 
-               the expression contains no marked sub-expressions, then one string is outputted 
-               for each section of the input that does not match the expression. If the 
-               expression does contain marked sub-expressions, then outputs one string for 
-               each marked sub-expression each time a match occurs. Outputs no more than <i>max_count</i>
-               strings. Before returning, deletes from the input string <i>s</i> all of the 
-               input that has been processed (all of the string if <i>max_count</i> was not 
-               reached). Returns the number of strings pushed onto the vector.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Position(<b>int</b> i = 0)<b>const</b>;</td>
-            <td valign="top" width="42%">Returns the position of what matched sub-expression <i>i</i>. 
-               If <i>i = 0</i> then returns the position of the whole match. Returns 
-               RegEx::npos if the supplied index is invalid, or if the specified 
-               sub-expression did not participate in the match.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Length(<b>int</b> i = 0)<b>const</b>;</td>
-            <td valign="top" width="42%">Returns the length of what matched sub-expression <i>i</i>. 
-               If <i>i = 0</i> then returns the length of the whole match. Returns RegEx::npos 
-               if the supplied index is invalid, or if the specified sub-expression did not 
-               participate in the match.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td><strong>bool</strong> Matched(<strong>int</strong> i = 0)<strong>const</strong>;</td>
-            <td>Returns true if sub-expression <em>i</em> was matched, false otherwise.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Line()<b>const</b>;</td>
-            <td valign="top" width="42%">Returns the line on which the match occurred, indexes 
-               start from 1 not zero, if no match occurred then returns RegEx::npos.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned int</b> Marks() const;</td>
-            <td valign="top" width="42%">Returns the number of marked sub-expressions 
-               contained in the expression. Note that this includes the whole match 
-               (sub-expression zero), so the value returned is always &gt;= 1.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string What(<b>int</b> i)<b>const</b>;</td>
-            <td valign="top" width="42%">Returns a copy of what matched sub-expression <i>i</i>. 
-               If <i>i = 0</i> then returns a copy of the whole match. Returns a null string 
-               if the index is invalid or if the specified sub-expression did not participate 
-               in a match.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string <b>operator</b>[](<b>int</b> i)<b>const</b>
-               ;</td>
-            <td valign="top" width="42%">Returns <i>what(i);</i>
-               <p>Can be used to simplify access to sub-expression matches, and make usage more 
-                  perl-like.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/regex_format.html b/doc/Attic/regex_format.html
deleted file mode 100644
index 74f21e9c..00000000
--- a/doc/Attic/regex_format.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>Boost.Regex: Algorithm regex_format (deprecated)</title>
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<p></p>
-
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../boost.png" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">Algorithm regex_format (deprecated)</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<p>The algorithm regex_format is deprecated; new code should use
-match_results::format instead.&nbsp; Existing code will continue to
-compile, the following documentation is taken from the previous
-version of boost.regex and will not be further updated:</p>
-
-<h3>Algorithm regex_format</h3>
-
-<pre>
-#include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
-</pre>
-
-<p>The algorithm regex_format takes the results of a match and
-creates a new string based upon a <a href="format_syntax.html">
-format string</a>, regex_format can be used for search and replace
-operations:</p>
-
-<pre>
-<b>template</b> &lt;<b>class</b> OutputIterator, <b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-OutputIterator regex_format(OutputIterator out,
-                            <b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m,
-                            <b>const</b> charT* fmt,
-                            match_flag_type flags = 0);
-<b>template</b> &lt;<b>class</b> OutputIterator, <b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-OutputIterator regex_format(OutputIterator out,
-                            <b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m,
-                            <b>const</b> std::basic_string&lt;charT&gt;&amp; fmt,
-                            match_flag_type flags = 0);
-</pre>
-
-<p>The library also defines the following convenience variation of
-regex_format, which returns the result directly as a string, rather
-than outputting to an iterator [note - this version may not be
-available, or may be available in a more limited form, depending
-upon your compilers capabilities]:</p>
-
-<pre>
-<b>template</b> &lt;<b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-std::basic_string&lt;charT&gt; regex_format
-                                 (<b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m, 
-                                  <b>const</b> charT* fmt,
-                                  match_flag_type flags = 0);
-
-<b>template</b> &lt;<b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-std::basic_string&lt;charT&gt; regex_format
-                                 (<b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m, 
-                                  <b>const</b> std::basic_string&lt;charT&gt;&amp; fmt,
-                                  match_flag_type flags = 0);
-</pre>
-
-<p>Parameters to the main version of the function are passed as
-follows:</p>
-
-<p></p>
-
-<table id="Table2" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">OutputIterator out</td>
-<td valign="top" width="44%">An output iterator type, the output
-string is sent to this iterator. Typically this would be a
-std::ostream_iterator.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%"><b>const</b>
-match_results&lt;iterator, Allocator&gt;&amp; m</td>
-<td valign="top" width="44%">An instance of match_results&lt;&gt;
-obtained from one of the matching algorithms above, and denoting
-what matched.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%"><b>const</b> charT* fmt</td>
-<td valign="top" width="44%">A format string that determines how
-the match is transformed into the new string.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%"><b>unsigned</b> flags</td>
-<td valign="top" width="44%">Optional flags which describe how the
-format string is to be interpreted.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p><a name="format_flags"></a>Format flags are defined as
-follows:</p>
-
-<p></p>
-
-<table id="Table3" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_all</td>
-<td valign="top" width="43%">Enables all syntax options (perl-like
-plus extentions).</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_sed</td>
-<td valign="top" width="43%">Allows only a sed-like syntax.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_perl</td>
-<td valign="top" width="43%">Allows only a perl-like syntax.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_no_copy</td>
-<td valign="top" width="43%">Disables copying of unmatched sections
-to the output string during <a href="regex_merge.html">
-regex_merge</a> operations.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td>&nbsp;</td>
-<td>format_first_only</td>
-<td>When this flag is set only the first occurance will be replaced
-(applies to regex_merge only).</td>
-<td>&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>The format string syntax (and available options) is described
-more fully under <a href="format_syntax.html">format strings</a>
-.</p>
-
-<p></p>
-
-<hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
-</html>
-
-
diff --git a/doc/Attic/regex_grep.html b/doc/Attic/regex_grep.html
deleted file mode 100644
index ac1d804b..00000000
--- a/doc/Attic/regex_grep.html
+++ /dev/null
@@ -1,377 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_grep (deprecated)</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Algorithm regex_grep (deprecated)</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>The algorithm regex_grep is deprecated in favor of <a href="regex_iterator.html">regex_iterator</a>
-         which provides a more convenient and standard library friendly interface.</p>
-      <p>The following documentation is taken unchanged from the previous boost release, 
-         and will not be updated in future.</p>
-      <hr>
-      <pre>
-#include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
-</pre>
-      <p>regex_grep allows you to search through a bidirectional-iterator range and 
-         locate all the (non-overlapping) matches with a given regular expression. The 
-         function is declared as:</p>
-      <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> iterator, <b>class</b> charT, <b>class</b> traits&gt;
-<b>unsigned</b> <b>int</b> regex_grep(Predicate foo,
-                         iterator first,
-                         iterator last,
-                         <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e,
-                         boost::match_flag_type flags = match_default)
-</pre>
-      <p>The library also defines the following convenience versions, which take either 
-         a const charT*, or a const std::basic_string&lt;&gt;&amp; in place of a pair of 
-         iterators [note - these versions may not be available, or may be available in a 
-         more limited form, depending upon your compilers capabilities]:</p>
-      <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> charT, <b>class</b> traits&gt;
-<b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
-              <b>const</b> charT* str, 
-              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
-              boost::match_flag_type flags = match_default);
-
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> charT, <b>class</b> traits&gt;
-<b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
-              <b>const</b> std::basic_string&lt;charT, ST, SA&gt;&amp; s, 
-              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
-              boost::match_flag_type flags = match_default);
-</pre>
-      <p>The parameters for the primary version of regex_grep have the following 
-         meanings:&nbsp;</p>
-      <p></p>
-      <table id="Table2" cellspacing="0" cellpadding="7" width="624" border="0">
-         <tr>
-            <td width="5%">&nbsp;</td>
-            <td valign="top" width="50%">foo</td>
-            <td valign="top" width="50%">A predicate function object or function pointer, see 
-               below for more information.</td>
-            <td width="5%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">first</td>
-            <td valign="top" width="50%">The start of the range to search.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">last</td>
-            <td valign="top" width="50%">The end of the range to search.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">e</td>
-            <td valign="top" width="50%">The regular expression to search for.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">flags</td>
-            <td valign="top" width="50%">The flags that determine how matching is carried out, 
-               one of the <a href="match_flag_type.html">match_flags</a> enumerators.</td>
-            <td>&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>The algorithm finds all of the non-overlapping matches of the expression e, for 
-         each match it fills a <a href="match_results.html">match_results</a>&lt;iterator&gt; 
-         structure, which contains information on what matched, and calls the predicate 
-         foo, passing the match_results&lt;iterator&gt; as a single argument. If the 
-         predicate returns true, then the grep operation continues, otherwise it 
-         terminates without searching for further matches. The function returns the 
-         number of matches found.</p>
-      <p>The general form of the predicate is:</p>
-      <pre>
-<b>struct</b> grep_predicate
-{
- <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type&gt;&amp; m);
-};
-</pre>
-      <p>For example the regular expression "a*b" would find one match in the string 
-         "aaaaab" and two in the string "aaabb".</p>
-      <p>Remember this algorithm can be used for a lot more than implementing a version 
-         of grep, the predicate can be and do anything that you want, grep utilities 
-         would output the results to the screen, another program could index a file 
-         based on a regular expression and store a set of bookmarks in a list, or a text 
-         file conversion utility would output to file. The results of one regex_grep can 
-         even be chained into another regex_grep to create recursive parsers.</p>
-      <P>The algorithm may throw&nbsp;<CODE>std::runtime_error</CODE> if the complexity 
-         of matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <p><a href="../example/snippets/regex_grep_example_1.cpp"> Example</a>: convert 
-         the example from <i>regex_search</i> to use <i>regex_grep</i> instead:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-
-</font><font color="#000080"><i>// 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 
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-
-const char* re = 
-   // possibly leading whitespace:   
-   "^[[:space:]]*" 
-   // possible template declaration:
-   "(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"
-   // class or struct:
-   "(class|struct)[[:space:]]*" 
-   // leading declspec macros etc:
-   "("
-      "\\&lt;\\w+\\&gt;"
-      "("
-         "[[:blank:]]*\\([^)]*\\)"
-      ")?"
-      "[[:space:]]*"
-   ")*" 
-   // the class name
-   "(\\&lt;\\w*\\&gt;)[[:space:]]*" 
-   // template specialisation parameters
-   "(&lt;[^;:{]+&gt;)?[[:space:]]*"
-   // terminate in { or :
-   "(\\{|:[^;\\{()]*\\{)";
-
-boost::regex expression(re); 
-<b>class</b> IndexClassesPred 
-{ 
-   map_type&amp; m; 
-   std::string::const_iterator base; 
-<b>public</b>: 
-   IndexClassesPred(map_type&amp; a, std::string::const_iterator b) : m(a), base(b) {} 
-   <b>bool</b> <b>operator</b>()(<b>const</b>  smatch&amp; what) 
-   { 
- <font color=
-#000080>     <i>// what[0] contains the whole string 
-</i>      <i>// what[5] contains the class name. 
-</i>      <i>// what[6] contains the template specialisation if any. 
-</i>      <i>// add class name and position to map: 
-</i></font>      m[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-                what[5].first - base; 
-      <b>return</b> <b>true</b>; 
-   } 
-}; 
-<b>void</b> IndexClasses(map_type&amp; m, <b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   regex_grep(IndexClassesPred(m, start), start, end, expression); 
-}
-</pre>
-      <p><a href="../example/snippets/regex_grep_example_2.cpp"> Example</a>: Use 
-         regex_grep to call a global callback function:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-
-</font><font color="#000080"><i>// 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 
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-
-const char* re = 
-   // possibly leading whitespace:   
-   "^[[:space:]]*" 
-   // possible template declaration:
-   "(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"
-   // class or struct:
-   "(class|struct)[[:space:]]*" 
-   // leading declspec macros etc:
-   "("
-      "\\&lt;\\w+\\&gt;"
-      "("
-         "[[:blank:]]*\\([^)]*\\)"
-      ")?"
-      "[[:space:]]*"
-   ")*" 
-   // the class name
-   "(\\&lt;\\w*\\&gt;)[[:space:]]*" 
-   // template specialisation parameters
-   "(&lt;[^;:{]+&gt;)?[[:space:]]*"
-   // terminate in { or :
-   "(\\{|:[^;\\{()]*\\{)";
-
-boost::regex expression(re);
-map_type class_index; 
-std::string::const_iterator base; 
-
-<b>bool</b> grep_callback(<b>const</b>  boost::smatch&amp; what) 
-{ 
- <font color="#000080">  <i>// what[0] contains the whole string 
-</i>   <i>// what[5] contains the class name. 
-</i>   <i>// what[6] contains the template specialisation if any. 
-</i>   <i>// add class name and position to map: 
-</i></font>   class_index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-                what[5].first - base; 
-   <b>return</b> <b>true</b>; 
-} 
-<b>void</b> IndexClasses(<b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   base = start; 
-   regex_grep(grep_callback, start, end, expression, match_default); 
-}
- 
-</pre>
-      <p><a href="../example/snippets/regex_grep_example_3.cpp"> Example</a>: use 
-         regex_grep to call a class member function, use the standard library adapters <i>std::mem_fun</i>
-         and <i>std::bind1st</i> to convert the member function into a predicate:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-#include &lt;functional&gt; 
-</font><font color="#000080"><i>// 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 
-
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-<b>class</b> class_index 
-{ 
-   boost::regex expression; 
-   map_type index; 
-   std::string::const_iterator base; 
-   <b>bool</b>  grep_callback(boost::smatch what); 
-<b>public</b>: 
- <b>  void</b> IndexClasses(<b>const</b> std::string&amp; file); 
-   class_index() 
-      : index(), 
-        expression(<font color=
-#000080>"^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?" 
-                   "[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(\\{|:[^;\\{()]*\\{)" 
-</font>                   ){} 
-}; 
-<b>bool</b>  class_index::grep_callback(boost::smatch what) 
-{ 
- <font color="#000080">  <i>// what[0] contains the whole string 
-</i>   <i>// what[5] contains the class name. 
-</i>   <i>// what[6] contains the template specialisation if any. 
-</i>   <i>// add class name and position to map: 
-</i></font>   index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-               what[5].first - base; 
-   <b>return</b> <b>true</b>; 
-} 
-
-<b>void</b> class_index::IndexClasses(<b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   base = start; 
-   regex_grep(std::bind1st(std::mem_fun(&amp;class_index::grep_callback), <b>this</b>), 
-              start, 
-              end, 
-              expression); 
-} 
- 
-</pre>
-      <p><a href="../example/snippets/regex_grep_example_4.cpp"> Finally</a>, C++ 
-         Builder users can use C++ Builder's closure type as a callback argument:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-#include &lt;functional&gt; 
-</font><font color="#000080"><i>// 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 
-
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-<b>class</b> class_index 
-{ 
-   boost::regex expression; 
-   map_type index; 
-   std::string::const_iterator base; 
-   <b>typedef</b>  boost::smatch arg_type; 
-   <b>bool</b> grep_callback(<b>const</b> arg_type&amp; what); 
-<b>public</b>: 
-   <b>typedef</b> <b>bool</b> (<b>__closure</b>* grep_callback_type)(<b>const</b> arg_type&amp;); 
-   <b>void</b> IndexClasses(<b>const</b> std::string&amp; file); 
-   class_index() 
-      : index(), 
-        expression(<font color=
-#000080>"^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?" 
-                   "[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(\\{|:[^;\\{()]*\\{)" 
-</font>                   ){} 
-}; 
-
-<b>bool</b> class_index::grep_callback(<b>const</b> arg_type&amp; what) 
-{ 
- <font color=
-#000080>  <i>// what[0] contains the whole string</i>    
-<i>// what[5] contains the class name.</i>    
-<i>// what[6] contains the template specialisation if any.</i>    
-<i>// add class name and position to map:</i></font>    
-index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-               what[5].first - base; 
-   <b>return</b> <b>true</b>; 
-} 
-
-<b>void</b> class_index::IndexClasses(<b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   base = start; 
-   class_index::grep_callback_type cl = &amp;(<b>this</b>-&gt;grep_callback); 
-   regex_grep(cl, 
-            start, 
-            end, 
-            expression); 
-}
-</pre>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/regex_iterator.html b/doc/Attic/regex_iterator.html
deleted file mode 100644
index f2e647f5..00000000
--- a/doc/Attic/regex_iterator.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: regex_iterator</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link href="../../../boost.css" type="text/css" rel="stylesheet">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">regex_iterator</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Contents</h3>
-      <dl class="index">
-         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a> <dt><a href="#examples">
-                     Examples</a></dt>
-      </dl>
-      <h3><a name="synopsis"></a>Synopsis</h3>
-      <p>The iterator type regex_iterator will enumerate all of the regular expression 
-         matches found in some sequence: dereferencing a regex_iterator yields a 
-         reference to a&nbsp;<a href="match_results.html">match_results</a> object.</p>
-      <pre>
-template &lt;class BidirectionalIterator, 
-          class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt; &gt;
-class regex_iterator 
-{
-public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
-   typedef          <A href="match_results.html">match_results</A>&lt;BidirectionalIterator&gt;                    value_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
-   typedef          const value_type*                                       pointer;
-   typedef          const value_type&amp;                                       reference;
-   typedef          std::forward_iterator_tag                               iterator_category;
-   
-   <A href="#c1">regex_iterator</A>();
-   <A href="#c2">regex_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, 
-                  const regex_type&amp; re, 
-                  <A href="match_flag_type.html">match_flag_type</A> m = match_default);
-   <A href="#c3">regex_iterator</A>(const regex_iterator&amp;);
-   regex_iterator&amp; <A href="#o1">operator</A>=(const regex_iterator&amp;);
-   bool <A href="#o2">operator</A>==(const regex_iterator&amp;)const;
-   bool <A href="#o3">operator</A>!=(const regex_iterator&amp;)const;
-   const value_type&amp; <A href="#o4">operator</A>*()const;
-   const value_type* <A href="#o5">operator</A>-&gt;()const;
-   regex_iterator&amp; <A href="#o6">operator</A>++();
-   regex_iterator <A href="#o7">operator</A>++(int);
-};
-
-typedef
-regex_iterator&lt;const
-
-char*&gt; cregex_iterator; typedef                  regex_iterator&lt;std::string::const_iterator&gt;
-sregex_iterator; #ifndef  BOOST_NO_WREGEX
-typedef regex_iterator&lt;const
-wchar_t*&gt; wcregex_iterator; typedef               regex_iterator&lt;std::wstring::const_iterator&gt;
-wsregex_iterator; #endif template
-&lt;class
-
-charT, class traits&gt; regex_iterator&lt;const charT*,
-charT, traits&gt; 
-   <A href="#make_regex_iterator">make_regex_iterator</A>(const charT* p, const basic_regex&lt;charT, traits&gt;&amp; e, regex_constants::match_flag_type m =       regex_constants::match_default); template  &lt;class
-   
-charT, class traits, class ST, class SA&gt; regex_iterator&lt;typename std::basic_string&lt;charT,
-ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_iterator">make_regex_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, const basic_regex&lt;charT, traits&gt;&amp; e, regex_constants::match_flag_type m = regex_constants::match_default);
-
-</pre>
-      <h3><a name="description"></a>Description</h3>
-      <p>A regex_iterator is constructed from a pair of iterators, and enumerates all 
-         occurrences of a regular expression within that iterator range.</p>
-      <pre><A name=c1></A>
-regex_iterator();
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs an end of sequence regex_iterator.</p>
-      <pre><A name=c2></A>regex_iterator(BidirectionalIterator a, BidirectionalIterator b, 
-               const regex_type&amp; re, 
-               <A href="match_flag_type.html">match_flag_type</A> m = match_default);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs a regex_iterator that will enumerate all occurrences 
-         of the expression <em>re</em>, within the sequence <em>[a,b)</em>, and found 
-         using match flags <em>m</em>.&nbsp; The object <em>re</em> must exist for the 
-         lifetime of the regex_iterator.</p>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <pre><A name=c3></A>
-regex_iterator(const regex_iterator&amp; that);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs a copy of <code>that</code>.</p>
-      <b></b>
-      <p><b>Postconditions:</b> <code>*this == that</code>.</p>
-      <pre><A name=o1></A>
-regex_iterator&amp; operator=(const regex_iterator&amp;);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> sets&nbsp;<code>*this</code> equal to those in <code>that</code>.</p>
-      <b></b>
-      <p><b>Postconditions:</b> <code>*this == that</code>.</p>
-      <pre><A name=o2></A>
-bool operator==(const regex_iterator&amp; that)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> returns true if *this is equal to that.</p>
-      <pre><A name=o3></A>
-bool operator!=(const regex_iterator&amp;)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> returns <code>!(*this == that)</code>.</p>
-      <pre><A name=o4></A>
-const value_type&amp; operator*()const;
-</pre>
-      <p><b>Effects:</b> dereferencing a regex_iterator object <em>it</em> yields a 
-         const reference to a <a href="match_results.html">match_results</a> object, 
-         whose members are set as follows:</p>
-      <p></p>
-      <table id="Table2" cellspacing="1" cellpadding="7" width="624" border="1">
-         <tbody>
-            <tr>
-               <td valign="top" width="50%"><b></b>
-                  <p><b>Element</b></p>
-               </td>
-               <td valign="top" width="50%"><b></b>
-                  <p><b>Value</b></p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).size()</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>re.mark_count()</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).empty()</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>false</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).prefix().first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The end of the last match found, or the start of the underlying sequence if 
-                     this is the first match enumerated</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).prefix().last</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The same as the start of the match found:<BR>
-                     (*it)[0].first</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).prefix().matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>True if the prefix did not match an empty string:<BR>
-                     (*it).prefix().first != (*it).prefix().second</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).suffix().first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The same as the end of the match found:<BR>
-                     (*it)[0].second</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).suffix().last</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The end of the underlying sequence.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).suffix().matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>True if the suffix did not match an empty string:<BR>
-                     (*it).suffix().first != (*it).suffix().second</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[0].first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The start of the sequence of characters that matched the regular expression</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[0].second</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The end of the sequence of characters that matched the regular expression</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[0].matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p><code>true</code> if a full match was found, and <code>false</code> if it was a 
-                     partial match (found as a result of the <code>match_partial</code> flag being 
-                     set).</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[n].first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>For all integers n &lt; (*it).size(), the start of the sequence that matched 
-                     sub-expression <i>n</i>. Alternatively, if sub-expression n did not participate 
-                     in the match, then <i>last</i>.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[n].second</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>For all integers n &lt; (*it).size(), the end of the sequence that matched 
-                     sub-expression <i>n</i>. Alternatively, if sub-expression n did not participate 
-                     in the match, then <i>last</i>.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[n].matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>For all integers n &lt; (*it).size(), true if sub-expression <i>n</i> participated 
-                     in the match, false otherwise.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">(*it).position(n)</td>
-               <td valign="top" width="50%">For all integers n &lt; (*it).size(), then the 
-                  distance from the start of the underlying sequence to the start of 
-                  sub-expression match <em>n</em>.</td>
-            </tr>
-         </tbody>
-      </table>
-      <br>
-      <br>
-      <pre><A name=o5></A>
-const value_type* operator-&gt;()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> returns <code>&amp;(*this)</code>.</p>
-      <pre><A name=o6></A>
-regex_iterator&amp; operator++();
-</pre>
-      <p><strong>Effects:</strong> moves the iterator to the next match in the 
-         underlying sequence, or the end of sequence iterator if none if found. 
-         &nbsp;When the last match found matched a zero length string, then the 
-         regex_iterator will find the next match as follows: if there exists a non-zero 
-         length match that starts at the same location as the last one, then returns it, 
-         otherwise starts looking for the next (possibly zero length) match from one 
-         position to the right of the last match.</p>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <b></b>
-      <p><b>Returns:</b> <code>*this</code>.</p>
-      <pre><A name=o7></A>
-regex_iterator operator++(int);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs a copy <code>result</code> of <code>*this</code>, 
-         then calls <code>++(*this)</code>.</p>
-      <b></b>
-      <p><b>Returns:</b> <code>result</code>.</p>
-      <PRE><A name=make_regex_iterator></A>template &lt;class charT, class traits&gt; regex_iterator&lt;const charT*, charT, traits&gt;
-make_regex_iterator(const charT* 
-   p, const basic_regex&lt;charT, 
-                       traits&gt;&amp; e, regex_constants::match_flag_type m 
-                       = regex_constants::match_default); template &lt;class
-                       
-charT, class traits, class ST, class SA&gt; regex_iterator&lt;typename std::basic_string&lt;charT,
-ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                       const basic_regex&lt;charT, traits&gt;&amp; e, 
-                       regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P><STRONG>Effects:</STRONG> returns an iterator that enumerates all occurences of 
-         expression <EM>e</EM> in text <EM>p</EM> using match_flags <EM>m</EM>.</P>
-      <h3><a name=examples></a>Examples</h3>
-      <p>The following <a href="../example/snippets/regex_iterator_example.cpp">example</a>
-         takes a C++ source file and builds up an index of class names, and the location 
-         of that class in the file.</p>
-      <pre>
-<font color="#008040">#include &lt;string&gt;</font>
-<font color="#008040">#include &lt;map&gt;</font>
-<font color="#008040">#include &lt;fstream&gt;</font>
-<font color="#008040">#include &lt;iostream&gt;</font>
-<font color="#008040">#include &lt;boost/regex.hpp&gt;</font>
-
-<b>using</b> <b>namespace</b> std;
-
-<i><font color="#000080">// purpose:</font></i>
-<i><font color=
-#000080>// takes the contents of a file in the form of a string</font></i>
-<i><font color=
-#000080>// and searches for all the C++ class definitions, storing</font></i>
-<i><font color=
-#000080>// their locations in a map of strings/int's</font></i>
-
-<b>typedef</b> std::map&lt;std::string, std::string::difference_type, std::less&lt;std::string&gt; &gt; map_type;
-
-<b>const</b> <b>char</b>* re = 
-   <i><font color=
-#000080>// possibly leading whitespace:  </font></i> 
-   <font color="#0000ff">"^[[:space:]]*"</font> 
-   <i><font color=
-#000080>// possible template declaration:</font></i>
-   <font color=
-#0000ff>"(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</font>
-   <i><font color="#000080">// class or struct:</font></i>
-   <font color="#0000ff">"(class|struct)[[:space:]]*"</font> 
-   <i><font color=
-#000080>// leading declspec macros etc:</font></i>
-   <font color="#0000ff">"("</font>
-      <font color="#0000ff">"\\&lt;\\w+\\&gt;"</font>
-      <font color="#0000ff">"("</font>
-         <font color="#0000ff">"[[:blank:]]*\\([^)]*\\)"</font>
-      <font color="#0000ff">")?"</font>
-      <font color="#0000ff">"[[:space:]]*"</font>
-   <font color="#0000ff">")*"</font> 
-   <i><font color="#000080">// the class name</font></i>
-   <font color="#0000ff">"(\\&lt;\\w*\\&gt;)[[:space:]]*"</font> 
-   <i><font color=
-#000080>// template specialisation parameters</font></i>
-   <font color="#0000ff">"(&lt;[^;:{]+&gt;)?[[:space:]]*"</font>
-   <i><font color="#000080">// terminate in { or :</font></i>
-   <font color="#0000ff">"(\\{|:[^;\\{()]*\\{)"</font>;
-
-
-boost::regex expression(re);
-map_type class_index;
-
-<b>bool</b> regex_callback(<b>const</b> boost::match_results&lt;std::string::const_iterator&gt;&amp; what)
-{
-   <i><font color=
-#000080>// what[0] contains the whole string</font></i>
-   <i><font color=
-#000080>// what[5] contains the class name.</font></i>
-   <i><font color=
-#000080>// what[6] contains the template specialisation if any.</font></i>
-   <i><font color=
-#000080>// add class name and position to map:</font></i>
-   class_index[what[<font color=
-#0000a0>5</font>].str() + what[<font color=
-#0000a0>6</font>].str()] = what.position(<font color=
-#0000a0>5</font>);
-   <b>return</b> <b>true</b>;
-}
-
-<b>void</b> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   s.reserve(is.rdbuf()-&gt;in_avail());
-   <b>char</b> c;
-   <b>while</b>(is.get(c))
-   {
-      <b>if</b>(s.capacity() == s.size())
-         s.reserve(s.capacity() * <font color="#0000a0">3</font>);
-      s.append(<font color="#0000a0">1</font>, c);
-   }
-}
-
-<b>int</b> main(<b>int</b> argc, <b>const</b> <b>char</b>** argv)
-{
-   std::string text;
-   <b>for</b>(<b>int</b> i = <font color=
-#0000a0>1</font>; i &lt; argc; ++i)
-   {
-      cout &lt;&lt; <font color=
-#0000ff>"Processing file "</font> &lt;&lt; argv[i] &lt;&lt; endl;
-      std::ifstream fs(argv[i]);
-      load_file(text, fs);
-      <i><font color=
-#000080>// construct our iterators:</font></i>
-      boost::sregex_iterator m1(text.begin(), text.end(), expression);
-      boost::sregex_iterator m2;
-      std::for_each(m1, m2, &amp;regex_callback);
-      <i><font color="#000080">// copy results:</font></i>
-      cout &lt;&lt; class_index.size() &lt;&lt; <font color=
-#0000ff>" matches found"</font> &lt;&lt; endl;
-      map_type::iterator c, d;
-      c = class_index.begin();
-      d = class_index.end();
-      <b>while</b>(c != d)
-      {
-         cout &lt;&lt; <font color=
-#0000ff>"class \""</font> &lt;&lt; (*c).first &lt;&lt; <font
-color=
-#0000ff>"\" found at index: "</font> &lt;&lt; (*c).second &lt;&lt; endl;
-         ++c;
-      }
-      class_index.erase(class_index.begin(), class_index.end());
-   }
-   <b>return</b> <font color="#0000a0">0</font>;
-}
-</pre>
-      <hr>
-      <p>Revised&nbsp;&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         06 Jan 05&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2005<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/regex_match.html b/doc/Attic/regex_match.html
deleted file mode 100644
index 31c5eba6..00000000
--- a/doc/Attic/regex_match.html
+++ /dev/null
@@ -1,318 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_match</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_match</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a> <dt><a href="#examples">
-                     Examples</a></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <PRE><A name=query_match></A>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P>
-      The algorithm regex _match determines whether a given regular expression 
-      matches all of a given character sequence denoted by a pair of 
-      bidirectional-iterators, the algorithm is defined as follows, the main use of 
-      this function is data input validation.
-      <P><STRONG>Note that the result is true only if the expression matches the whole of 
-            the input sequence.&nbsp;</STRONG> If you want to search for an expression 
-         somewhere within the sequence then use <A href="regex_search.html">regex_search</A>.&nbsp; 
-         If you want to match a prefix of the character string then use <A href="regex_search.html">
-            regex_search</A> with the flag <A href="match_flag_type.html">match_continuous</A>
-         set.
-         <PRE>
-template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
-bool <A href="#f1">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
-                 <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class BidirectionalIterator, class charT, class traits&gt;
-bool <A href="#f2">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class charT, class Allocator, class traits&gt;
-bool <A href="#f3">regex_match</A>(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class ST, class SA, class Allocator, class charT, class traits&gt;
-bool <A href="#f4">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class charT, class traits&gt;
-bool <A href="#f5">regex_match</A>(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class ST, class SA, class charT, class traits&gt;
-bool <A href="#f6">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-</PRE>
-         <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
-bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                 <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
-         Bidirectional Iterator (24.1.4).</P>
-      <P><B> Effects: </B>Determines whether there is an exact match between the regular 
-         expression <I>e</I>, and all of the character sequence [first, last), parameter <I>
-            flags</I> is used to <A href="match_flag_type.html">control how the expression 
-            is matched</A> against the character sequence. Returns true if such a match 
-         exists, false otherwise.</P>
-      <P><STRONG>Throws:</STRONG> <code>std::runtime_error</code> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><B> Postconditions: </B>If the function returns false, then the effect on 
-         parameter <I>m</I> is undefined, otherwise the effects on parameter <I>m</I> are 
-         given in the table:</P>
-      <P align="center">
-         <CENTER>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="7" width="624" border="1">
-               <TBODY>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P><B> Element</B>
-                        </P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P><B> Value</B>
-                        </P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.size()</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>e.mark_count()</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.empty()</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>false</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.prefix().first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>first</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.prefix().last</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>first</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.prefix().matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>false</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.suffix().first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>last</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.suffix().last</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>last</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.suffix().matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>false</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[0].first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>first</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[0].second</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>last</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[0].matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P><CODE> true</CODE> if a full match was found, and <CODE>false</CODE> if it was 
-                           a partial match (found as a result of the <CODE>match_partial</CODE> flag being 
-                           set).</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[n].first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>For all integers n &lt; m.size(), the start of the sequence that matched 
-                           sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                           in the match, then <I>last</I>.</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[n].second</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>For all integers n &lt; m.size(), the end of the sequence that matched 
-                           sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                           in the match, then <I>last</I>.</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[n].matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>For all integers n &lt; m.size(), true if sub-expression <I>n</I> participated 
-                           in the match, false otherwise.</P>
-                     </TD>
-                  </TR>
-               </TBODY></TD></TR></TABLE>
-         </CENTER>
-      <P></P>
-      <DIV></DIV>
-      <PRE>&nbsp;</PRE>
-      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits&gt;
-bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><A href="match_results.html">
-               match_results</A>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
-         and then returning the result of <CODE>regex_match(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f3></A>template &lt;class charT, class Allocator, class traits&gt;
-bool regex_match(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
-            char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class ST, class SA, class Allocator,
-          class charT, class traits&gt;
-bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), m, e, 
-            flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
-bool regex_match(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
-            char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
-bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), e, 
-            flags)</CODE>.
-         <H3><A name="examples"></A>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_match_example.cpp">example</A>
-      processes an ftp response:
-      <P></P>
-      <PRE><FONT color=#008000>#include &lt;stdlib.h&gt; 
-#include &lt;boost/regex.hpp&gt; 
-#include &lt;string&gt; 
-#include &lt;iostream&gt; 
-
-</FONT><B>using namespace</B> boost; 
-
-regex expression(<FONT color=#000080>"([0-9]+)(\\-| |$)(.*)"</FONT>); 
-
-<FONT color=#000080><I>// process_ftp: 
-// on success returns the ftp response code, and fills 
-// msg with the ftp response message. 
-</I></FONT><B>int</B> process_ftp(<B>const</B> <B>char</B>* response, std::string* msg) 
-{ 
-&nbsp;&nbsp; cmatch what; 
-&nbsp;&nbsp; <B>if</B>(regex_match(response, what, expression)) 
-&nbsp;&nbsp; { 
-<FONT color=#000080>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[0] contains the whole string 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[1] contains the response code 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[2] contains the separator character 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[3] contains the text message. 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <B>if</B>(msg) 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; msg-&gt;assign(what[3].first, what[3].second); 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <B>return</B> std::atoi(what[1].first); 
-&nbsp;&nbsp; } 
-<FONT color=#000080>&nbsp;&nbsp; <I>// failure did not match 
-</I></FONT>&nbsp;&nbsp; <B>if</B>(msg) 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; msg-&gt;erase(); 
-&nbsp;&nbsp; <B>return</B> -1; 
-}
-      <P>
-         <HR></PRE>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/regex_merge.html b/doc/Attic/regex_merge.html
deleted file mode 100644
index bbfcc23b..00000000
--- a/doc/Attic/regex_merge.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_merge (deprecated)</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_merge (deprecated)</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Algorithm regex_merge has been renamed <A href="regex_replace.html">regex_replace</A>, 
-         existing code will continue to compile, but new code should use <A href="regex_replace.html">
-            regex_replace</A> instead.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/regex_replace.html b/doc/Attic/regex_replace.html
deleted file mode 100644
index 2005ccb0..00000000
--- a/doc/Attic/regex_replace.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_replace</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_replace</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a> <dt><A href="#examples">
-                     Examples</A></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <PRE>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P>The algorithm regex_replace&nbsp;searches&nbsp;through&nbsp;a string finding 
-         all the matches to the regular expression: for each match it then calls <A href="match_results.html#format">
-            match_results::format</A> to format the string and sends the result to the 
-         output iterator. Sections of text that do not match are copied to the output 
-         unchanged only if the <EM>flags</EM> parameter does not have the flag <A href="match_flag_type.html">
-            format_no_copy</A> set. If the flag <A href="match_flag_type.html">format_first_only</A>
-         is set then only the first occurrence is replaced rather than all 
-         occurrences.&nbsp;<PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
-OutputIterator <A href="#f1">regex_replace</A>(OutputIterator out,
-                           BidirectionalIterator first,
-                           BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                           const basic_string&lt;charT&gt;&amp; fmt,
-                           <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
-
-template &lt;class traits, class charT&gt;
-basic_string&lt;charT&gt; <A href="#f2">regex_replace</A>(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                            const basic_string&lt;charT&gt;&amp; fmt,
-                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
-
-</PRE>
-         <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
-OutputIterator regex_replace(OutputIterator out,
-                           BidirectionalIterator first,
-                           BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                           const basic_string&lt;charT&gt;&amp; fmt,
-                           <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
-      <P>Enumerates all the occurences of expression <EM>e</EM> in the sequence [first, 
-         last), replacing each occurence with the string that results by merging the 
-         match found with the format string <EM>fmt</EM>, and copies the resulting 
-         string to <EM>out</EM>.&nbsp;</P>
-      <P>If the flag format_no_copy is set in <EM>flags</EM> then unmatched sections of 
-         text are not copied to output.&nbsp;
-      </P>
-      <P>If the flag format_first_only is set in <EM>flags</EM> then only the first 
-         occurence of <EM>e</EM> is replaced.&nbsp;
-      </P>
-      <P>The manner in which the format string <EM>fmt</EM> is interpretted, along with 
-         the rules used&nbsp;for finding matches,&nbsp;are determined by the <A href="match_flag_type.html">
-            flags</A> set in <EM>flags</EM></P>
-      <P><B>Effects:</B> Constructs an
-         <SPAN class="spelle">regex_iterator</SPAN>
-         object:
-      </P>
-      <PRE><SPAN style="FONT-SIZE: 10pt">regex_iterator&lt;</SPAN><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">BidirectionalIterator</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt">, </SPAN><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">charT</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt">, traits, Allocator&gt; <BR>                                            </SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">i(</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt">first, last, e, flags)</SPAN>, </PRE>
-      <P>and uses
-         <SPAN class="spelle">
-            <I>i</I></SPAN>
-         to enumerate through all of the matches <I>m</I> of type
-         <SPAN class="spelle">
-            <SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">match_results</SPAN>
-         </SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">&lt;<SPAN class="spelle">BidirectionalIterator</SPAN>&gt; </SPAN>that 
-         occur within the sequence [first, last).
-      </P>
-      <P>If no such matches are found
-         <SPAN class="grame">and </SPAN></P>
-      <PRE><SPAN class=grame></SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">!</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(flags &amp; <SPAN class=spelle>format_no_copy</SPAN>)</SPAN> </PRE>
-      <P>then calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">std::copy</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(first, last, out)</SPAN>. </PRE>
-      <P>Otherwise, for each match found,
-         <SPAN class="grame">if </SPAN></P>
-      <PRE><SPAN class=grame></SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">!</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(flags &amp; <SPAN class=spelle>format_no_copy</SPAN>)</SPAN> </PRE>
-      <P>calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">std::copy</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(<SPAN class=spelle>m.prefix</SPAN>().first, <SPAN class=spelle>m.prefix</SPAN>().last, out)</SPAN>, </PRE>
-      <P>and then calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">m.format</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(out, <SPAN class=spelle>fmt</SPAN>, flags)</SPAN>. </PRE>
-      <P>Finally
-         <SPAN class="grame">if </SPAN></P>
-      <PRE><SPAN class=grame></SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">!</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(flags &amp; <SPAN class=spelle>format_no_copy</SPAN>)</SPAN> </PRE>
-      <P>calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">std::copy</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(<SPAN class=spelle>last_m.suffix</SPAN>().first, <SPAN class=spelle>last_m,suffix</SPAN>().last, out) </SPAN></PRE>
-      <P><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'"></SPAN>where
-         <SPAN class="spelle">
-            <SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">last_m</SPAN>
-         </SPAN>
-         is a copy of the last match found.
-      </P>
-      <P>If
-         <SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">flags &amp; 
-<SPAN class="spelle">format_first_only</SPAN></SPAN>
-         is non-zero then only the first match found is replaced.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><B> Returns:</B> <CODE>out</CODE>.
-      </P>
-      <PRE><A name=f2></A>template &lt;class traits, class charT&gt;
-basic_string&lt;charT&gt; regex_replace(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                            const basic_string&lt;charT&gt;&amp; fmt,
-                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
-      <P><B> Effects:</B> Constructs an object <CODE>basic_string&lt;charT&gt; result</CODE>, 
-         calls <CODE>regex_replace(back_inserter(result), s.begin(), s.end(), e, fmt, 
-            flags)</CODE>, and then returns <CODE>result</CODE>.
-         <H3><A name="examples"></A>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_replace_example.cpp">example</A>
-         takes C/C++ source code as input, and outputs syntax highlighted HTML code.</P>
-      <P></P>
-      <PRE><FONT color=#008080>#include &lt;fstream&gt;
-#include &lt;sstream&gt;
-#include &lt;string&gt;
-#include &lt;iterator&gt;
-#include &lt;boost/regex.hpp&gt;
-#include &lt;fstream&gt;
-#include &lt;iostream&gt;
-</FONT>
-<FONT color=#000080><I>// purpose:
-// takes the contents of a file and transform to
-// syntax highlighted code in html format
-</I></FONT>
-boost::regex e1, e2;
-<B>extern</B> <B>const</B> <B>char</B>* expression_text;
-<B>extern</B> <B>const</B> <B>char</B>* format_string;
-<B>extern</B> <B>const</B> <B>char</B>* pre_expression;
-<B>extern</B> <B>const</B> <B>char</B>* pre_format;
-<B>extern</B> <B>const</B> <B>char</B>* header_text;
-<B>extern</B> <B>const</B> <B>char</B>* footer_text;
-
-<B>void</B> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   s.reserve(is.rdbuf()-&gt;in_avail());
-   <B>char</B> c;
-   <B>while</B>(is.get(c))
-   {
-      <B>if</B>(s.capacity() == s.size())
-         s.reserve(s.capacity() * <FONT color=#000080>3</FONT>);
-      s.append(<FONT color=#000080>1</FONT>, c);
-   }
-}
-
-<B>int</B> main(<B>int</B> argc, <B>const</B> <B>char</B>** argv)
-{
-   try{
-   e1.assign(expression_text);
-   e2.assign(pre_expression);
-   <B>for</B>(<B>int</B> i = <FONT color=#000080>1</FONT>; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#0000ff>"Processing file "</FONT> &lt;&lt; argv[i] &lt;&lt; std::endl;
-      std::ifstream fs(argv[i]);
-      std::string in;
-      load_file(in, fs);
-      std::string out_name(std::string(argv[i]) + std::string(<FONT color=#0000ff>".htm"</FONT>));
-      std::ofstream os(out_name.c_str());
-      os &lt;&lt; header_text;
-      <FONT color=#000080><I>// strip '&lt;' and '&gt;' first by outputting to a
-</I></FONT>      <FONT color=#000080><I>// temporary string stream
-</I></FONT>      std::ostringstream t(std::ios::out | std::ios::binary);
-      std::ostream_iterator&lt;<B>char</B>, <B>char</B>&gt; oi(t);
-      boost::regex_replace(oi, in.begin(), in.end(),
-      e2, pre_format, boost::match_default | boost::format_all);
-      <FONT color=#000080><I>// then output to final output stream
-</I></FONT>      <FONT color=#000080><I>// adding syntax highlighting:
-</I></FONT>      std::string s(t.str());
-      std::ostream_iterator&lt;<B>char</B>, <B>char</B>&gt; out(os);
-      boost::regex_replace(out, s.begin(), s.end(),
-      e1, format_string, boost::match_default | boost::format_all);
-      os &lt;&lt; footer_text;
-   }
-   }
-   <STRONG>catch</STRONG>(...)
-   { <STRONG>return</STRONG> -1; }
-   <B>return</B> <FONT color=#000080>0</FONT>;
-}
-
-<B>extern</B> <B>const</B> <B>char</B>* pre_expression = <FONT color=#0000ff>"(&lt;)|(&gt;)|(&amp;)|\\r"</FONT>;
-<B>extern</B> <B>const</B> <B>char</B>* pre_format = <FONT color=#0000ff>"(?1&lt;)(?2&gt;)(?3&amp;amp;)"</FONT>;
-
-
-<B>const</B> <B>char</B>* expression_text = <FONT color=#000080><I>// preprocessor directives: index 1
-</I></FONT>                              <FONT color=#0000ff>"(^[[:blank:]]*#(?:[^\\\\\\n]|\\\\[^\\n[:punct:][:word:]]*[\\n[:punct:][:word:]])*)|"
-</FONT>                              <FONT color=#000080><I>// comment: index 2
-</I></FONT>                              <FONT color=#0000ff>"(//[^\\n]*|/\\*.*?\\*/)|"
-</FONT>                              <FONT color=#000080><I>// literals: index 3
-</I></FONT>                              <FONT color=#0000ff>"\\&lt;([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\\.)?[[:digit:]]+(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\\&gt;|"
-</FONT>                              <FONT color=#000080><I>// string literals: index 4
-</I></FONT>                              <FONT color=#0000ff>"('(?:[^\\\\']|\\\\.)*'|\"(?:[^\\\\\"]|\\\\.)*\")|"
-</FONT>                              <FONT color=#000080><I>// keywords: index 5
-</I></FONT>                              <FONT color=#0000ff>"\\&lt;(__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import"
-</FONT>                              <FONT color=#0000ff>"|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall"
-</FONT>                              <FONT color=#0000ff>"|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|bool"
-</FONT>                              <FONT color=#0000ff>"|break|case|catch|cdecl|char|class|const|const_cast|continue|default|delete"
-</FONT>                              <FONT color=#0000ff>"|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto"
-</FONT>                              <FONT color=#0000ff>"|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected"
-</FONT>                              <FONT color=#0000ff>"|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast"
-</FONT>                              <FONT color=#0000ff>"|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned"
-</FONT>                              <FONT color=#0000ff>"|using|virtual|void|volatile|wchar_t|while)\\&gt;"
-</FONT>                              ;
-
-<B>const</B> <B>char</B>* format_string = <FONT color=#0000ff>"(?1&lt;font color=\"#008040\"&gt;$&amp;&lt;/font&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?2&lt;I&gt;&lt;font color=\"#000080\"&gt;$&amp;&lt;/font&gt;&lt;/I&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?3&lt;font color=\"#0000A0\"&gt;$&amp;&lt;/font&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?4&lt;font color=\"#0000FF\"&gt;$&amp;&lt;/font&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?5&lt;B&gt;$&amp;&lt;/B&gt;)"</FONT>;
-
-<B>const</B> <B>char</B>* header_text = <FONT color=#0000ff>"&lt;HTML&gt;\n&lt;HEAD&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;TITLE&gt;Auto-generated html formated source&lt;/TITLE&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=windows-1252\"&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;/HEAD&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;BODY LINK=\"#0000ff\" VLINK=\"#800080\" BGCOLOR=\"#ffffff\"&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;P&gt; &lt;/P&gt;\n&lt;PRE&gt;"</FONT>;
-
-<B>const</B> <B>char</B>* footer_text = <FONT color=#0000ff>"&lt;/PRE&gt;\n&lt;/BODY&gt;\n\n"</FONT>;
-      </PRE>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/regex_search.html b/doc/Attic/regex_search.html
deleted file mode 100644
index 22691687..00000000
--- a/doc/Attic/regex_search.html
+++ /dev/null
@@ -1,315 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_search</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_search</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a> <dt><A href="#examples">
-                     Examples</A></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <PRE>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P></P>
-      <P>The algorithm regex_search will search a range denoted by a pair of 
-         bidirectional-iterators for a given regular expression. The algorithm uses 
-         various heuristics to reduce the search time by only checking for a match if a 
-         match could conceivably start at that position. The algorithm is defined as 
-         follows:
-         <PRE>template &lt;class BidirectionalIterator, 
-          class Allocator, class charT, class traits&gt;
-bool <A href="#f1">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last,
-                  <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
-                  
-template &lt;class ST, class SA, 
-          class Allocator, class charT, class traits&gt; 
-bool <A href="#f2">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s, 
-                  <a href="match_results.html">match_results</a>&lt;
-                      typename basic_string&lt;charT, ST,SA&gt;::const_iterator, 
-                      Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
-          
-template&lt;class charT, class Allocator, class traits&gt; 
-bool <A href="#f3">regex_search</A>(const charT* str, 
-                  <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
-                  
-template &lt;class BidirectionalIterator, class charT, class traits&gt;                
-bool <A href="#f4">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
-                  
-template &lt;class charT, class traits&gt; 
-bool <A href="#f5">regex_search</A>(const charT* str, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
-                  
-template&lt;class ST, class SA, class charT, class traits&gt;
-bool <A href="#f6">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
-</PRE>
-         <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
-bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
-                  <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
-         Bidirectional Iterator (24.1.4).</P>
-      <P><B> Effects: </B>Determines whether there is some sub-sequence within 
-         [first,last) that matches the regular expression <I>e</I>, parameter <I>flags</I>
-         is used to control how the expression is matched against the character 
-         sequence. Returns true if such a sequence exists, false otherwise.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><B> Postconditions: </B>If the function returns false, then the effect on 
-         parameter <I>m</I> is undefined, otherwise the effects on parameter <I>m</I> are 
-         given in the table:</P>
-      <DIV align="center">
-         <CENTER>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="7" width="624" border="1">
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P><B> Element</B></P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P><B> Value</B>
-                     </P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.size()</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>e.mark_count()</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.empty()</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>false</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>first</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().last</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].first</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().first != m.prefix().second</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].second</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().last</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>last</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().first != m.suffix().second</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>The start of the sequence of characters that matched the regular expression</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].second</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>The end of the sequence of characters that matched the regular expression</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P><CODE> true</CODE> if a full match was found, and <CODE>false</CODE> if it was 
-                        a partial match (found as a result of the <CODE>match_partial</CODE> flag being 
-                        set).</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[n].first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>For all integers n &lt; m.size(), the start of the sequence that matched 
-                        sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                        in the match, then <I>last</I>.</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[n].second</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>For all integers n &lt; m.size(), the end of the sequence that matched 
-                        sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                        in the match, then <I>last</I>.</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[n].matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>For all integers n &lt; m.size(), true if sub-expression <I>n</I> participated 
-                        in the match, false otherwise.</P>
-                  </TD>
-               </TR>
-               </TD></TR></TABLE>
-         </CENTER>
-      </DIV>
-      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits&gt;
-bool regex_search(const charT* str, <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
-            char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
-      <PRE><A name=f3></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits&gt;
-bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  <a href="match_results.html">match_results</a>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), m, 
-            e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class iterator, class charT, class traits&gt;
-bool regex_search(iterator first, iterator last,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><a href="match_results.html">
-               match_results</a>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
-         and then returning the result of <CODE>regex_search(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
-bool regex_search(const charT* str
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
-            char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
-bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), e, 
-            flags)</CODE>.
-         <H3><A name="examples"></A>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_search_example.cpp">example</A>, 
-         takes the contents of a file in the form of a string, and searches for all the 
-         C++ class declarations in the file. The code will work regardless of the way 
-         that std::string is implemented, for example it could easily be modified to 
-         work with the SGI rope class, which uses a non-contiguous storage strategy.</P>
-      <P></P>
-      <PRE><FONT color=#008000>#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-</FONT><FONT color=#000080><I>
-// 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 
-</I></FONT><B>typedef</B> std::map&lt;std::string, <B>int</B>, std::less&lt;std::string&gt; &gt; map_type; 
-
-boost::regex expression("^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?(\\{|:[^;\\{()]*\\{)"); 
-<B>
-void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file) 
-{ 
-&nbsp;&nbsp; std::string::const_iterator start, end; 
-&nbsp;&nbsp; start = file.begin(); 
-&nbsp;&nbsp; end = file.end();&nbsp;
-&nbsp;&nbsp; &nbsp;&nbsp; boost::<a href="match_results.html">match_results</a>&lt;std::string::const_iterator&gt; what; 
-&nbsp;&nbsp; boost::match_flag_type flags = boost::match_default; 
-&nbsp;&nbsp; <B>while</B>(regex_search(start, end, what, expression, flags))&nbsp;
-&nbsp;&nbsp; { 
-<FONT color=#000080>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[0] contains the whole string 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[5] contains the class name. 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[6] contains the template specialisation if any. 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// add class name and position to map: 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; m[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] =&nbsp;
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; what[5].first - file.begin();&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <FONT color=#000080><I>// update search position: 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; start = what[0].second;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <FONT color=#000080><I>// update flags: 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; flags |= boost::match_prev_avail;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; flags |= boost::match_not_bob;&nbsp;
-&nbsp;&nbsp; } 
-}
-     </PRE>
-      <HR>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         23 June 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/regex_split.html b/doc/Attic/regex_split.html
deleted file mode 100644
index a3b7b293..00000000
--- a/doc/Attic/regex_split.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_split (deprecated)</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_split (deprecated)</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The algorithm regex_split has been deprecated in favor of the iterator <A href="regex_token_iterator.html">
-            regex_token_iterator</A> which has a more flexible and powerful interface, 
-         as well as following the more usual standard library "pull" rather than "push" 
-         semantics.</P>
-      <P>Code which uses regex_split will continue to compile, the following 
-         documentation is taken from the previous boost.regex version:</P>
-      <H3><A name="regex_split"></A>Algorithm regex_split</H3>
-      <PRE>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P>Algorithm regex_split performs a similar operation to the perl split operation, 
-         and comes in three overloaded forms:
-      </P>
-      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
-std::size_t regex_split(OutputIterator out,&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
-&nbsp;<STRONG>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</STRONG>boost::match_flag_type flags,
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::size_t max_split);
-
-<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
-std::size_t regex_split(OutputIterator out,&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boost::match_flag_type flags = match_default);
-
-<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1&gt;
-std::size_t regex_split(OutputIterator out, 
-                        std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s);</PRE>
-      <P><STRONG>Effects: </STRONG>Each version of the algorithm takes an 
-         output-iterator for output, and a string for input. If the expression contains 
-         no marked sub-expressions, then the algorithm writes one string onto the 
-         output-iterator for each section of input that does not match the expression. 
-         If the expression does contain marked sub-expressions, then each time a match 
-         is found, one string for each marked sub-expression will be written to the 
-         output-iterator. No more than <I>max_split </I>strings will be written to the 
-         output-iterator. Before returning, all the input processed will be deleted from 
-         the string <I>s</I> (if <I>max_split </I>is not reached then all of <I>s</I> will 
-         be deleted). Returns the number of strings written to the output-iterator. If 
-         the parameter <I>max_split</I> is not specified then it defaults to UINT_MAX. 
-         If no expression is specified, then it defaults to "\s+", and splitting occurs 
-         on whitespace.
-      </P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><A href="../example/snippets/regex_split_example_1.cpp">Example</A>: the 
-         following function will split the input string into a series of tokens, and 
-         remove each token from the string <I>s</I>:
-      </P>
-      <PRE><B>unsigned</B> tokenise(std::list&lt;std::string&gt;&amp; l, std::string&amp; s)
-{
-<B>&nbsp;&nbsp; return</B> boost::regex_split(std::back_inserter(l), s);
-}</PRE>
-      <P><A href="../example/snippets/regex_split_example_2.cpp">Example</A>: the 
-         following short program will extract all of the URL's from a html file, and 
-         print them out to <I>cout</I>:
-      </P>
-      <PRE><FONT color=#008000>#include &lt;list&gt;
-#include &lt;fstream&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/regex.hpp&gt;
-</FONT>
-boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)\""</FONT>,
-               boost::regbase::normal | boost::regbase::icase);
-
-<B>void</B> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   <FONT color=#000080>//
-   // attempt to grow string buffer to match file size,
-   // this doesn't always work...
-</FONT>   s.reserve(is.rdbuf()-&amp;gtin_avail());
-   <B>char</B> c;
-   <B>while</B>(is.get(c))
-   {
-      <FONT color=#000080>// use logarithmic growth stategy, in case
-      // in_avail (above) returned zero:
-</FONT>      <B>if</B>(s.capacity() == s.size())
-         s.reserve(s.capacity() * 3);
-      s.append(1, c);
-   }
-}
-
-
-<B>int</B> main(<B>int</B> argc, <B>char</B>** argv)
-{
-   std::string s;
-   std::list&lt;std::string&gt; l;
-
-   <B>for</B>(<B>int</B> i = 1; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#000080>"Findings URL's in "</FONT> &lt;&lt; argv[i] &lt;&lt; <FONT color=#000080>":"</FONT> &lt;&lt; std::endl;
-      s.erase();
-      std::ifstream is(argv[i]);
-      load_file(s, is);
-      boost::regex_split(std::back_inserter(l), s, e);
-      <B>while</B>(l.size())
-      {
-         s = *(l.begin());
-         l.pop_front();
-         std::cout &lt;&lt; s &lt;&lt; std::endl;
-      }
-   }
-   <B>return</B> 0;
-}</PRE>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June&nbsp;2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/regex_token_iterator.html b/doc/Attic/regex_token_iterator.html
deleted file mode 100644
index 9bd59050..00000000
--- a/doc/Attic/regex_token_iterator.html
+++ /dev/null
@@ -1,381 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: regex_token_iterator</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">regex_token_iterator</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a> <dt><A href="#examples">
-                     Examples</A></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The template class <CODE>regex_token_iterator</CODE> is an iterator adapter; 
-         that is to say it represents a new view of an existing iterator sequence, by 
-         enumerating all the occurrences of a regular expression within that sequence, 
-         and presenting one or more character sequence for each match found. Each 
-         position enumerated by the iterator is a <A href="sub_match.html">sub_match</A> 
-         object that represents what matched a particular sub-expression within the 
-         regular expression. When class <CODE>regex_token_iterator</CODE> is used to 
-         enumerate a single sub-expression with index -1, then the iterator performs 
-         field splitting: that is to say it enumerates one character sequence for each 
-         section of the character container sequence that does not match the regular 
-         expression specified.</P>
-      <PRE>
-template &lt;class BidirectionalIterator, 
-          class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt; &gt;
-class regex_token_iterator 
-{
-public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
-   typedef          <A href="sub_match.html">sub_match</A>&lt;BidirectionalIterator&gt;                        value_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
-   typedef          const value_type*                                       pointer;
-   typedef          const value_type&amp;                                       reference;
-   typedef          std::forward_iterator_tag                               iterator_category;
-   
-   <A href="#c1">regex_token_iterator</A>();
-   <A href="#c2">regex_token_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                        int submatch = 0, <A href="match_flag_type.html">match_flag_type</A> m = match_default);
-   <A href="#c3">regex_token_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                        const std::vector&lt;int&gt;&amp; submatches, match_flag_type m = match_default);
-   template &lt;std::size_t N&gt;
-   <A href="#c4">regex_token_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                        const int (&amp;submatches)[N], match_flag_type m = match_default);
-   <A href="#c5">regex_token_iterator</A>(const regex_token_iterator&amp;);
-   regex_token_iterator&amp; <A href="#o1">operator</A>=(const regex_token_iterator&amp;);
-   bool <A href="#o2">operator</A>==(const regex_token_iterator&amp;)const;
-   bool <A href="#o3">operator</A>!=(const regex_token_iterator&amp;)const;
-   const value_type&amp; <A href="#o4">operator</A>*()const;
-   const value_type* <A href="#o5">operator</A>-&gt;()const;
-   regex_token_iterator&amp; <A href="#o6">operator</A>++();
-   regex_token_iterator <A href="#o7">operator</A>++(int);
-};
-
-typedef regex_token_iterator&lt;const char*&gt;                   cregex_token_iterator;
-typedef regex_token_iterator&lt;std::string::const_iterator&gt;   sregex_token_iterator;
-#ifndef BOOST_NO_WREGEX
-typedef regex_token_iterator&lt;const wchar_t*&gt;                wcregex_token_iterator;
-typedef regex_token_iterator&lt;&lt;std::wstring::const_iterator&gt; wsregex_token_iterator;
-#endif
-
-template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, std::size_t N&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-  <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const charT* p, 
-                            const basic_regex&lt;charT, traits&gt;&amp; e, 
-                            const int (&amp;submatch)[N], 
-                            regex_constants::match_flag_type m = regex_constants::match_default);
-                            
-template &lt;class charT, class traits, class ST, class SA, std::size_t N&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const int (&amp;submatch)[N], 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <H3><A name="description"></A>Description</H3>
-      <PRE><A name=c1></A>regex_token_iterator();</PRE>
-      <P><B> Effects:</B> constructs an end of sequence iterator.</P>
-      <PRE><A name=c2></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                     int submatch = 0, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
-         for the lifetime of the iterator constructed from it.</P>
-      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate one 
-         string for each regular expression match of the expression <EM>re</EM> found 
-         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; The 
-         string enumerated is the&nbsp;sub-expression <EM>submatch </EM>for each match 
-         found; if <EM>submatch </EM>is -1, then enumerates all the text sequences that 
-         did not match the expression <EM>re </EM>(that is to performs field splitting).</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <PRE><A name=c3></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                     const std::vector&lt;int&gt;&amp; submatches, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions:</B> <CODE>submatches.size() &amp;&amp; !re.empty()</CODE>.&nbsp; 
-         Object re shall exist for the lifetime of the iterator constructed from it.</P>
-      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate <EM>submatches.size()</EM>
-         strings for each regular expression match of the expression <EM>re</EM> found 
-         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; For 
-         each match found one string will be enumerated&nbsp;for each sub-expression 
-         index&nbsp;contained within <EM>submatches </EM>vector; if <EM>submatches[0] </EM>
-         is -1, then the first string enumerated for each match will be all of the text 
-         from end of the last match to the start of the current match, in addition there 
-         will be one extra string enumerated when no more matches can be found: from the 
-         end of the last match found, to the end of the underlying sequence.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <PRE><A name=c4></A>template &lt;std::size_t N&gt;
-regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                     const int (&amp;submatches)[R], match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
-         for the lifetime of the iterator constructed from it.</P>
-      <P><STRONG>Effects:</STRONG></B> constructs a regex_token_iterator that will 
-         enumerate&nbsp;<EM>R</EM> strings for each regular expression match of the 
-         expression <EM>re</EM> found within the sequence <EM>[a,b)</EM>, using match 
-         flags <EM>m</EM>.&nbsp; For each match found one string will be 
-         enumerated&nbsp;for each sub-expression index&nbsp;contained within the <EM>submatches
-         </EM>array; if <EM>submatches[0] </EM>is -1, then the first string enumerated 
-         for each match will be all of the text from end of the last match to the start 
-         of the current match, in addition there will be one extra string enumerated 
-         when no more matches can be found: from the end of the last match found, to the 
-         end of the underlying sequence.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <PRE><A name=c5></A>regex_token_iterator(const regex_token_iterator&amp; that);</PRE>
-      <P><B> Effects: </B>constructs a copy of <CODE>that</CODE>.</P>
-      <P><B> Postconditions:</B> <CODE>*this == that</CODE>.</P>
-      <PRE><A name=o1></A>regex_token_iterator&amp; operator=(const regex_token_iterator&amp; that);</PRE>
-      <P><B> Effects: </B>sets <CODE>*this</CODE> to be equal to&nbsp;<CODE>that</CODE>.</P>
-      <P><B> Postconditions:</B> <CODE>*this == that</CODE>.</P>
-      <PRE><A name=o2></A>bool operator==(const regex_token_iterator&amp;)const;</PRE>
-      <P>
-         <B>Effects: </B>returns true if *this is the same position as that.</P>
-      <PRE><A name=o3></A>bool operator!=(const regex_token_iterator&amp;)const;</PRE>
-      <P>
-         <B>Effects: </B>returns <CODE>!(*this == that)</CODE>.</P>
-      <PRE><A name=o4></A>const value_type&amp; operator*()const;</PRE>
-      <P>
-         <B>Effects: </B>returns the current character sequence being enumerated.</P>
-      <PRE><A name=o5></A>const value_type* operator-&gt;()const;</PRE>
-      <P>
-         <B>Effects: </B>returns <CODE>&amp;(*this)</CODE>.</P>
-      <PRE><A name=o6></A>regex_token_iterator&amp; operator++();</PRE>
-      <P>
-         <B>Effects: </B>Moves on to the next character sequence to be enumerated.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <B>
-         <P>
-         Returns:</B><CODE> *this</CODE>.</P><PRE><A name=o7></A>regex_token_iterator&amp; operator++(int);</PRE>
-      <P><B> Effects:</B> constructs a copy <CODE>result</CODE> of <CODE>*this</CODE>, 
-         then calls <CODE>++(*this)</CODE>.</P>
-      <P><B> Returns:</B> <CODE>result</CODE>.<A name="examples"></A>
-         <PRE><A name=make_regex_token_iterator></A>template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   make_regex_token_iterator(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_token_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, std::size_t N&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-  make_regex_token_iterator(const charT* p, 
-                            const basic_regex&lt;charT, traits&gt;&amp; e, 
-                            const int (&amp;submatch)[N], 
-                            regex_constants::match_flag_type m = regex_constants::match_default);
-                            
-template &lt;class charT, class traits, class ST, class SA, std::size_t N&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_token_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const int (&amp;submatch)[N], 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   make_regex_token_iterator(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_token_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P>Effects: returns a <A href="#synopsis">regex_token_iterator</A> that enumerates 
-         one <A href="sub_match.html">sub_match</A> for each value in <EM>submatch</EM> for 
-         each occurrence of regular expression <EM>e</EM> in string <EM>p</EM>, matched 
-         using <A href="match_flag_type.html">match_flags</A> <EM>m</EM>.</P>
-      <P></P>
-      <H3>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_token_iterator_eg_1.cpp">example</A>
-         takes a string and splits it into a series of tokens:</P>
-      <pre>
-<FONT color=#008040>#include &lt;iostream&gt;</FONT>
-<FONT color=#008040>#include &lt;boost/regex.hpp&gt;</FONT>
-
-<B>using</B> <B>namespace</B> std;
-
-<B>int</B> main(<B>int</B> argc)
-{
-   string s;
-   <B>do</B>{
-      <B>if</B>(argc == <FONT color=#0000a0>1</FONT>)
-      {
-         cout &lt;&lt; <FONT color=#0000ff>"Enter text to split (or \"quit\" to exit): "</FONT>;
-         getline(cin, s);
-         <B>if</B>(s == <FONT color=#0000ff>"quit"</FONT>) <B>break</B>;
-      }
-      <B>else</B>
-         s = <FONT color=#0000ff>"This is a string of tokens"</FONT>;
-
-      boost::regex re(<FONT color=#0000ff>"\\s+"</FONT>);
-      boost::sregex_token_iterator i(s.begin(), s.end(), re, -<FONT color=#0000a0>1</FONT>);
-      boost::sregex_token_iterator j;
-
-      <B>unsigned</B> count = <FONT color=#0000a0>0</FONT>;
-      <B>while</B>(i != j)
-      {
-         cout &lt;&lt; *i++ &lt;&lt; endl;
-         count++;
-      }
-      cout &lt;&lt; <FONT color=#0000ff>"There were "</FONT> &lt;&lt; count &lt;&lt; <FONT color=#0000ff>" tokens found."</FONT> &lt;&lt; endl;
-
-   }<B>while</B>(argc == <FONT color=#0000a0>1</FONT>);
-   <B>return</B> <FONT color=#0000a0>0</FONT>;
-}
-
-</pre>
-      <P>The following <A href="../example/snippets/regex_token_iterator_eg_2.cpp">example</A>
-         takes a html file and outputs a list of all the linked files:</P>
-      <pre>
-<FONT color=#008040>#include &lt;fstream&gt;</FONT>
-<FONT color=#008040>#include &lt;iostream&gt;</FONT>
-<FONT color=#008040>#include &lt;iterator&gt;</FONT>
-<FONT color=#008040>#include &lt;boost/regex.hpp&gt;</FONT>
-
-boost::regex e(<FONT color=#0000ff>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)\""</FONT>,
-               boost::regex::normal | boost::regbase::icase);
-
-<B>void</B> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   <I><FONT color=#000080>//</FONT></I>
-   <I><FONT color=#000080>// attempt to grow string buffer to match file size,</FONT></I>
-   <I><FONT color=#000080>// this doesn't always work...</FONT></I>
-   s.reserve(is.rdbuf()-&gt;in_avail());
-   <B>char</B> c;
-   <B>while</B>(is.get(c))
-   {
-      <I><FONT color=#000080>// use logarithmic growth stategy, in case</FONT></I>
-      <I><FONT color=#000080>// in_avail (above) returned zero:</FONT></I>
-      <B>if</B>(s.capacity() == s.size())
-         s.reserve(s.capacity() * <FONT color=#0000a0>3</FONT>);
-      s.append(<FONT color=#0000a0>1</FONT>, c);
-   }
-}
-
-<B>int</B> main(<B>int</B> argc, <B>char</B>** argv)
-{
-   std::string s;
-   <B>int</B> i;
-   <B>for</B>(i = <FONT color=#0000a0>1</FONT>; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#0000ff>"Findings URL's in "</FONT> &lt;&lt; argv[i] &lt;&lt; <FONT color=#0000ff>":"</FONT> &lt;&lt; std::endl;
-      s.erase();
-      std::ifstream is(argv[i]);
-      load_file(s, is);
-      boost::sregex_token_iterator i(s.begin(), s.end(), e, <FONT color=#0000a0>1</FONT>);
-      boost::sregex_token_iterator j;
-      <B>while</B>(i != j)
-      {
-         std::cout &lt;&lt; *i++ &lt;&lt; std::endl;
-      }
-   }
-   <I><FONT color=#000080>//</FONT></I>
-   <I><FONT color=#000080>// alternative method:</FONT></I>
-   <I><FONT color=#000080>// test the array-literal constructor, and split out the whole</FONT></I>
-   <I><FONT color=#000080>// match as well as $1....</FONT></I>
-   <I><FONT color=#000080>//</FONT></I>
-   <B>for</B>(i = <FONT color=#0000a0>1</FONT>; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#0000ff>"Findings URL's in "</FONT> &lt;&lt; argv[i] &lt;&lt; <FONT color=#0000ff>":"</FONT> &lt;&lt; std::endl;
-      s.erase();
-      std::ifstream is(argv[i]);
-      load_file(s, is);
-      <B>const</B> <B>int</B> subs[] = {<FONT color=#0000a0>1</FONT>, <FONT color=#0000a0>0</FONT>,};
-      boost::sregex_token_iterator i(s.begin(), s.end(), e, subs);
-      boost::sregex_token_iterator j;
-      <B>while</B>(i != j)
-      {
-         std::cout &lt;&lt; *i++ &lt;&lt; std::endl;
-      }
-   }
-
-   <B>return</B> <FONT color=#0000a0>0</FONT>;
-}
-</pre>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/regex_traits.html b/doc/Attic/regex_traits.html
deleted file mode 100644
index dc1708f7..00000000
--- a/doc/Attic/regex_traits.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: class regex_traits</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">class regex_traits</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <pre>
-namespace boost{
-
-template &lt;class charT, class implementationT = sensible_default_choice&gt;
-struct regex_traits : public implementationT
-{
-   regex_traits() : implementationT() {}
-};
-
-template &lt;class charT&gt;
-struct c_regex_traits;
-
-template &lt;class charT&gt;
-struct cpp_regex_traits;
-
-template &lt;class charT&gt;
-struct w32_regex_traits;
-
-} // namespace boost
-</pre>
-      <H3><A name="description"></A>Description</H3>
-      <P>The class regex_traits is just a thin wrapper around an actual implemention 
-         class, which may be one of:</P>
-      <UL>
-         <LI>
-            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.</LI>
-         <LI>
-            cpp_regex_traits: the default traits class for non-Win32 platforms, allows the 
-            regex class to be imbued with a std::locale instance.</LI>
-         <LI>
-            w32_regex_traits: the default traits class implementation on Win32 platforms, 
-            allows the regex class to be imbued with an LCID.</LI></UL>
-      <P>The default behavior can be altered by defining one of the following 
-         configuration macros in <A href="../../../boost/regex/user.hpp">boost/regex/user.hpp</A>:</P>
-      <UL>
-         <LI>
-            BOOST_REGEX_USE_C_LOCALE: makes c_regex_traits the default.</LI>
-         <LI>
-            BOOST_REGEX_USE_CPP_LOCALE: makes cpp_regex_traits the default.</LI></UL>
-      <P>All these traits classes fulfil the <A href="concepts.html#traits">traits class 
-            requirements</A>.</P>
-      <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->
-            2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/standards.html b/doc/Attic/standards.html
deleted file mode 100644
index d5bc8c46..00000000
--- a/doc/Attic/standards.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Standards Conformance</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Standards Conformance</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>C++</H3>
-      <P>Boost.regex is intended to conform to the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            regular expression standardization proposal</A>, which will appear in a 
-         future C++ standard technical report (and hopefully in a future version of the 
-         standard).&nbsp;</P>
-      <H3>ECMAScript / JavaScript</H3>
-      <P>All of the ECMAScript regular expression syntax features are supported, except 
-         that:</P>
-      <P>Negated class escapes (\S, \D and \W) are not permitted inside character class 
-         definitions ( [...] ).</P>
-      <P>The escape sequence \u matches any upper case character (the same as 
-         [[:upper:]])&nbsp;rather than a Unicode escape sequence; use \x{DDDD} for 
-         Unicode escape sequences.</P>
-      <H3>Perl</H3>
-      <P>Almost all Perl features are supported, except for:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD>(?{code})</TD>
-               <TD>Not implementable in a compiled strongly typed language.</TD>
-            </TR>
-            <TR>
-               <TD>(??{code})</TD>
-               <TD>Not implementable in a compiled strongly typed language.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>POSIX</H3>
-      <P>All the POSIX basic and extended regular expression features are supported, 
-         except that:</P>
-      <P>No character collating names are recognized except those specified in the POSIX 
-         standard for the C locale, unless they are explicitly registered with the 
-         traits class.</P>
-      <P>Character equivalence classes ( [[=a=]] etc) are probably buggy except on 
-         Win32.&nbsp; Implementing this feature requires knowledge of the format of the 
-         string sort keys produced by the system; if you need this, and the default 
-         implementation doesn't work on your platform, then you will need to supply a 
-         custom traits class.</P>
-      <H3>Unicode</H3>
-      <P>The following comments refer to&nbsp;<A href="http://www.unicode.org/reports/tr18/">Unicode 
-            Technical
-            <SPAN>Standard 
-</SPAN>#18: Unicode Regular Expressions</A>&nbsp;version 9.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD>#</TD>
-               <TD>Feature</TD>
-               <TD>Support</TD>
-            </TR>
-            <TR>
-               <TD>1.1</TD>
-               <TD>Hex Notation</TD>
-               <TD>Yes: use \x{DDDD} to refer to code point UDDDD.</TD>
-            </TR>
-            <TR>
-               <TD>1.2</TD>
-               <TD>Character Properties</TD>
-               <TD>All the names listed under the&nbsp;<A href="http://www.unicode.org/reports/tr18/#Categories">General 
-                     Category Property</A> are supported.&nbsp; Script names and Other Names are 
-                  not currently supported.</TD>
-            </TR>
-            <TR>
-               <TD>1.3</TD>
-               <TD><A name="Subtraction_and_Intersection">Subtraction</A> and Intersection</TD>
-               <TD>
-                  <P>Indirectly support by forward-lookahead:
-                  </P>
-                  <P>(?=[[:X:]])[[:Y:]]</P>
-                  <P>Gives the intersection of character properties X and Y.</P>
-                  <P>(?![[:X:]])[[:Y:]]</P>
-                  <P>Gives everything in Y that is not in X (subtraction).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>1.4</TD>
-               <TD><A name="Simple_Word_Boundaries">Simple Word Boundaries</A></TD>
-               <TD>Conforming: non-spacing marks are included in the set of word characters.</TD>
-            </TR>
-            <TR>
-               <TD>1.5</TD>
-               <TD>Caseless Matching</TD>
-               <TD>Supported, note that at this level, case transformations are 1:1, many to many 
-                  case folding operations are not supported (for example&nbsp;"ß" to "SS").</TD>
-            </TR>
-            <TR>
-               <TD>1.6</TD>
-               <TD>Line Boundaries</TD>
-               <TD>Supported, except that "." matches only one character of "\r\n". Other than 
-                  that word boundaries match correctly; including not matching in the middle of a 
-                  "\r\n" sequence.</TD>
-            </TR>
-            <TR>
-               <TD>1.7</TD>
-               <TD>Code Points</TD>
-               <TD>Supported: provided you use the <A href="icu_strings.html">u32* algorithms</A>, 
-                  then UTF-8, UTF-16 and UTF-32 are all treated as sequences of 32-bit code 
-                  points.</TD>
-            </TR>
-            <TR>
-               <TD>2.1</TD>
-               <TD>Canonical Equivalence</TD>
-               <TD>Not supported: it is up to the user of the library to convert all text into 
-                  the same canonical form as the regular expression.</TD>
-            </TR>
-            <TR>
-               <TD>2.2</TD>
-               <TD>Default Grapheme Clusters</TD>
-               <TD>Not supported.</TD>
-            </TR>
-            <TR>
-               <TD>2.3</TD>
-               <TD><!--StartFragment -->
-                  <P><A name="Default_Word_Boundaries">Default Word Boundaries</A></P>
-               </TD>
-               <TD>Not supported.</TD>
-            </TR>
-            <TR>
-               <TD>2.4</TD>
-               <TD><!--StartFragment -->
-                  <P><A name="Default_Loose_Matches">Default Loose Matches</A></P>
-               </TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>2.5</TD>
-               <TD>Name Properties</TD>
-               <TD>Supported: the expression "[[:name:]]" or \N{name} matches the named character 
-                  "name".</TD>
-            </TR>
-            <TR>
-               <TD>2.6</TD>
-               <TD>Wildcard properties</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.1</TD>
-               <TD>Tailored Punctuation.</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.2</TD>
-               <TD>Tailored Grapheme Clusters</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.3</TD>
-               <TD>Tailored Word Boundaries.</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.4</TD>
-               <TD>Tailored Loose Matches</TD>
-               <TD>Partial support: [[=c=]] matches characters with the same primary equivalence 
-                  class as "c".</TD>
-            </TR>
-            <TR>
-               <TD>3.5</TD>
-               <TD>Tailored Ranges</TD>
-               <TD>Supported: [a-b] matches any character that collates in the range a to b, when 
-                  the expression is constructed with the <A href="syntax_option_type.html">collate</A>
-                  flag set.</TD>
-            </TR>
-            <TR>
-               <TD>3.6</TD>
-               <TD>Context Matches</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.7</TD>
-               <TD>Incremental Matches</TD>
-               <TD>Supported: pass the flag <A href="match_flag_type.html">match_partial</A> to 
-                  the regex algorithms.</TD>
-            </TR>
-            <TR>
-               <TD>3.8</TD>
-               <TD>Unicode Set Sharing</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.9</TD>
-               <TD>Possible Match Sets</TD>
-               <TD>Not supported, however this information is used internally to optimise the 
-                  matching of regular expressions, and return quickly if no match is possible.</TD>
-            </TR>
-            <TR>
-               <TD>3.10</TD>
-               <TD>Folded Matching</TD>
-               <TD>Partial Support:&nbsp; It is possible to achieve a similar effect by using a 
-                  custom regular expression traits class.</TD>
-            </TR>
-            <TR>
-               <TD>3.11</TD>
-               <TD>Custom&nbsp;Submatch Evaluation</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
-
diff --git a/doc/Attic/sub_match.html b/doc/Attic/sub_match.html
deleted file mode 100644
index 388d6773..00000000
--- a/doc/Attic/sub_match.html
+++ /dev/null
@@ -1,571 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: sub_match</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">sub_match</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Synopsis</H3>
-      <P>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt;
-      </P>
-      <P>Regular expressions are different from many simple pattern-matching algorithms 
-         in that as well as finding an overall match they can also produce 
-         sub-expression matches: each sub-expression being delimited in the pattern by a 
-         pair of parenthesis (...). There has to be some method for reporting 
-         sub-expression matches back to the user: this is achieved this by defining a 
-         class <I><A href="match_results.html">match_results</A></I> that acts as an 
-         indexed collection of sub-expression matches, each sub-expression match being 
-         contained in an object of type <I>sub_match</I>
-      .
-      <P>Objects of type <EM>sub_match</EM> may only obtained by subscripting an object 
-         of type <EM><A href="match_results.html">match_results</A></EM>
-      .
-      <P>Objects of type <EM>sub_match</EM> may be compared to objects of type <EM>std::basic_string</EM>, 
-         or <EM>const charT*</EM> or <EM>const charT</EM>
-      .
-      <P>Objects of type <EM>sub_match</EM> may be added to objects of type <EM>std::basic_string</EM>, 
-         or <EM>const charT* </EM>or <EM>const charT</EM>, to produce a new <EM>std::basic_string
-         </EM>
-      object.
-      <P>When the marked sub-expression denoted by an object of type sub_match&lt;&gt; 
-         participated in a regular expression match then member <CODE>matched</CODE> evaluates 
-         to true, and members <CODE>first</CODE> and <CODE>second</CODE> denote the 
-         range of characters <CODE>[first,second)</CODE> which formed that match. 
-         Otherwise <CODE>matched</CODE> is false, and members <CODE>first</CODE> and <CODE>second</CODE>
-         contained undefined values.</P>
-      <P>When the marked sub-expression denoted by an object of type sub_match&lt;&gt; 
-         was repeated, then the sub_match object represents the match obtained by the 
-         last repeat.&nbsp; The complete set of all the captures obtained for all the 
-         repeats, may be accessed via the captures() member function (Note: this has 
-         serious performance implications, you have to explicitly enable this feature).</P>
-      <P>If an object of type <CODE>sub_match&lt;&gt;</CODE> represents sub-expression 0 
-         - that is to say the whole match - then member <CODE>matched</CODE> is always 
-         true, unless a partial match was obtained as a result of the flag <CODE>match_partial</CODE>
-         being passed to a regular expression algorithm, in which case member <CODE>matched</CODE>
-         is false, and members <CODE>first</CODE> and <CODE>second</CODE> represent the 
-         character range that formed the partial match.</P>
-      <PRE>namespace boost{
-
-template &lt;class BidirectionalIterator&gt;
-class sub_match;
-
-typedef sub_match&lt;const char*&gt; csub_match;
-typedef sub_match&lt;const wchar_t*&gt; wcsub_match;
-typedef sub_match&lt;std::string::const_iterator&gt; ssub_match;
-typedef sub_match&lt;std::wstring::const_iterator&gt; wssub_match;
-
-template &lt;class BidirectionalIterator&gt;
-class sub_match : public std::pair&lt;BidirectionalIterator, BidirectionalIterator&gt;
-{
-public:
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::value_type       value_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type  difference_type;
-   typedef          BidirectionalIterator                                    iterator;
-
-   bool <A href="#m1" >matched</A>;
-
-   difference_type <A href="#m2" >length</A>()const;
-   operator <A href="#m3" >basic_string</A>&lt;value_type&gt;()const;
-   basic_string&lt;value_type&gt; <A href="#m4" >str</A>()const;
-
-   int <A href="#m5" >compare</A>(const sub_match&amp; s)const;
-   int <A href="#m6" >compare</A>(const basic_string&lt;value_type&gt;&amp; s)const;
-   int <A href="#m7" >compare</A>(const value_type* s)const;
-#ifdef BOOST_REGEX_MATCH_EXTRA
-   typedef implementation-private <A href="#m9">capture_sequence_type</A>;
-   const capture_sequence_type&amp; <A href="#m8" >captures</A>()const;
-#endif
-};
-//
-// comparisons to another sub_match:
-//
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o11" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o12" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o13" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o14" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o15" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o16" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-
-
-//
-// comparisons to a basic_string:
-//
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o21" >operator</A> == (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o22" >operator</A> != (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o23" >operator</A> &lt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o24" >operator</A> &gt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o25" >operator</A> &gt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o26" >operator</A> &lt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o31" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o32" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o33" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o34" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o35" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o36" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-
-//
-// comparisons to a pointer to a character array:
-//
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o41" >operator</A> == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o42" >operator</A> != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o43" >operator</A> &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o44" >operator</A> &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o45" >operator</A> &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o46" >operator</A> &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o51" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o52" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o53" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o54" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o55" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o56" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-
-//
-// comparisons to a single character:
-//
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o61" >operator</A> == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o62" >operator</A> != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o63" >operator</A> &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o64" >operator</A> &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o65" >operator</A> &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o66" >operator</A> &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o71" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o72" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o73" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o74" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o75" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o76" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-// 
-// addition operators: 
-//
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt; 
-    <A href="#o81" >operator</A> + (const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); 
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;
-    <A href="#o82" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s); 
-template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o83" >operator</A> + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); 
-template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o84" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const * s);
-template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o85" >operator</A> + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); 
-template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o86" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s); 
-template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o87" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m1,
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m2);
-
-//
-// stream inserter:
-//
-template &lt;class charT, class traits, class BidirectionalIterator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   <A href="#oi" >operator</A> &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os,
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m);
-
-} // namespace boost</PRE>
-      <H3>Description</H3>
-      <H4>sub_match members</H4>
-      <PRE>typedef typename std::iterator_traits&lt;iterator&gt;::value_type value_type;</PRE>
-      <P>The type pointed to by the iterators.</P>
-      <PRE>typedef typename std::iterator_traits&lt;iterator&gt;::difference_type difference_type;</PRE>
-      <P>A type that represents the difference between two iterators.</P>
-      <PRE>typedef iterator iterator_type;</PRE>
-      <P>The iterator type.</P>
-      <PRE>iterator first</PRE>
-      <P>An iterator denoting the position of the start of the match.</P>
-      <PRE>iterator second</PRE>
-      <P>An iterator denoting the position of the end of the match.</P>
-      <PRE><A name=m1></A>bool matched</PRE>
-      <P>A Boolean value denoting whether this sub-expression participated in the match.</P>
-      <PRE><A name=m2></A>static difference_type length();</PRE>
-      <P><B>Effects: </B>returns the length of this matched sub-expression, or 0 if this 
-         sub-expression was not matched: <CODE>matched ? distance(first, second) : 0)</CODE>.</P>
-      <PRE><A name=m3></A>operator basic_string&lt;value_type&gt;()const;</PRE>
-      <P><B>Effects: </B>converts *this into a string: returns <CODE>(matched ? 
-         basic_string&lt;value_type&gt;(first, second) : 
-         basic_string&lt;value_type&gt;()).</P>
-      </CODE><PRE><A name=m4></A>basic_string&lt;value_type&gt; str()const;</PRE>
-      <P><B>Effects: </B>returns a string representation of *this:&nbsp; <CODE>(matched ? 
-            basic_string&lt;value_type&gt;(first, second) : 
-            basic_string&lt;value_type&gt;())</CODE>.</P>
-      <PRE><A name=m5></A>int compare(const sub_match&amp; s)const;</PRE>
-      <P><B>Effects: </B>performs a lexical comparison to <EM>s</EM>: returns <CODE>str().compare(s.str())</CODE>.</P>
-      <PRE><A name=m6></A>int compare(const basic_string&lt;value_type&gt;&amp; s)const;</PRE>
-      <P><B>Effects: </B>compares *this to the string s: returns <CODE>str().compare(s)</CODE>.</P>
-      <PRE><A name=m7></A>int compare(const value_type* s)const;</PRE>
-      <P><B>Effects:<B></B> </B>compares *this to the null-terminated string <EM>s</EM>:<B>&nbsp;</B>returns
-         <CODE>str().compare(s)</CODE>.</P>
-      <PRE><A name=m9></A>typedef implementation-private capture_sequence_type;</PRE>
-      <P>Defines an implementation-specific type that&nbsp;satisfies the requirements of 
-         a standard library Sequence (21.1.1 including the optional Table 68 
-         operations),&nbsp;whose value_type is a <EM>sub_match&lt;BidirectionalIterator&gt;</EM>.&nbsp;This 
-         type happens to be <EM>std::vector&lt;sub_match&lt;BidirectionalIterator&gt; &gt;</EM>, 
-         but you shouldn't actually rely on that.</P>
-      <PRE><A name=m8></A>const capture_sequence_type&amp; <A href="#m8" >captures</A>()const; </PRE>
-      <P><STRONG>Effects:</STRONG> returns a sequence containing all the captures 
-         obtained for this sub-expression.</P>
-      <P><STRONG>Preconditions:</STRONG> the library must be built and used with 
-         BOOST_REGEX_MATCH_EXTRA defined, and you must pass the flag <A href="match_flag_type.html">
-            match_extra</A> to the regex matching functions (<A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, <A href="regex_iterator.html">regex_iterator</A>
-         or <A href="regex_token_iterator.html">regex_token_iterator</A>) in order for 
-         this member function to be defined and return useful information.</P>
-      <P><STRONG>Rationale:</STRONG> Enabling this feature has several consequences:
-      </P>
-      <UL>
-         <LI>
-         sub_match occupies more memory resulting in complex expressions running out of 
-         memory or stack space more quickly during matching.
-         <LI>
-            The matching algorithms are less efficient at handling some features 
-            (independent sub-expressions for example), even when <EM>match_extra</EM>
-         is not used.
-         <LI>
-            The matching algorithms are much less efficient (i.e. slower), when <EM>match_extra</EM>
-            is used.&nbsp; Mostly this is down to the extra memory allocations that have to 
-            take place.</LI></UL>
-      <H4>sub_match non-member operators</H4>
-      <H5>Comparisons against self</H5>
-      <PRE><A name=o11></A>template &lt;class BidirectionalIterator&gt;
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) == 0</CODE>.</P>
-      <PRE><A name=o12></A>template &lt;class BidirectionalIterator&gt;
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) != 0</CODE>.</P>
-      <PRE><A name=o13></A>template &lt;class BidirectionalIterator&gt;
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &lt; 0</CODE>.</P>
-      <PRE><A name=o14></A>template &lt;class BidirectionalIterator&gt;
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &lt;= 0</CODE>.</P>
-      <PRE><A name=o15></A>template &lt;class BidirectionalIterator&gt;
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &gt;= 0</CODE>.</P>
-      <PRE><A name=o16></A>template &lt;class BidirectionalIterator&gt;
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &gt; 0</CODE>.</P>
-      <H5>Comparisons with std::basic_string</H5>
-      <pre><A name=o21></A>
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator == (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits,
-                  Allocator&gt;&amp; lhs, const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-</pre>
-      <P><B>Effects: </B>returns <CODE>lhs == rhs.str()</CODE>.</P>
-      <PRE><A name=o22></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator != (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs != rhs.str()</CODE>.</P>
-      <PRE><A name=o23></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs&nbsp;&lt; rhs.str()</CODE>.</P>
-      <PRE><A name=o24></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs&nbsp;&gt; rhs.str()</CODE>.</P>
-      <PRE><A name=o25></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o26></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o31></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() == rhs</CODE>.</P>
-      <PRE><A name=o32></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() != rhs</CODE>.</P>
-      <PRE><A name=o33></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str()&nbsp;&lt; rhs</CODE>.</P>
-      <PRE><A name=o34></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str()&nbsp;&gt; rhs</CODE>.</P>
-      <PRE><A name=o35></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt;= rhs</CODE>.</P>
-      <PRE><A name=o36></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt;= rhs</CODE>.</P>
-      <H5>Comparisons with null-terminated strings</H5>
-      <PRE><A name=o41></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs == rhs.str()</CODE>.</P>
-      <PRE><A name=o42></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs != rhs.str()</CODE>.</P>
-      <PRE></A><A name=o43></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt; rhs.str()</CODE>.</P>
-      <PRE><A name=o44></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt; rhs.str()</CODE>.</P>
-      <PRE><A name=o45></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o46></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o51></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() == rhs</CODE>.</P>
-      <PRE><A name=o52></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() != rhs</CODE>.</P>
-      <PRE><A name=o53></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt; rhs</CODE>.</P>
-      <PRE><A name=o54></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt; rhs</CODE>.</P>
-      <PRE><A name=o55></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt;= rhs</CODE>.</P>
-      <PRE><A name=o56></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt;= rhs</CODE>.</P>
-      <H5>Comparisons with a single character</H5>
-      <PRE><A name=o61></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs == rhs.str()</CODE>.</P>
-      <PRE><A name=o62></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs != rhs.str()</CODE>.</P>
-      <PRE><A name=o63></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt; rhs.str()</CODE>.</P>
-      <PRE><A name=o64></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt; rhs.str()</CODE>.</P>
-      <PRE><A name=o65></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o66></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o71></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() == rhs</CODE>.</P>
-      <PRE><A name=o72></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() != rhs</CODE>.</P>
-      <PRE><A name=o73></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt; rhs</CODE>.</P>
-      <PRE><A name=o74></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt; rhs</CODE>.</P>
-      <PRE><A name=o75></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt;= rhs</CODE>.</P>
-      <PRE><A name=o76></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt;= rhs</CODE>.</P>
-      <h5>Addition operators</h5>
-      <P>The addition operators for sub_match allow you to add a sub_match to any type 
-         to which you can add a std::string and obtain a new string as the result.</P>
-      <PRE><A name=o81></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt; 
-    operator + (const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); </PRE>
-      <P><B>Effects: </B>returns <CODE>s + m.str()</CODE>.</P>
-      <PRE><A name=o82></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s); </PRE>
-      <P><B>Effects: </B>returns <CODE>m.str() + s</CODE>.</P>
-      <PRE><A name=o83></A>template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); </PRE>
-      <P><B>Effects: </B>returns <CODE>s + m.str()</CODE>.</P>
-      <PRE><A name=o84></A>template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const * s);</PRE>
-      <P><B>Effects: </B>returns <CODE>m.str() + s</CODE>.</P>
-      <PRE><A name=o85></A>template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); </PRE>
-      <P><B>Effects: </B>returns <CODE>s + m.str()</CODE>.</P>
-      <PRE><A name=o86></A>template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s); </PRE>
-      <P><B>Effects: </B>returns <CODE>m.str() + s</CODE>.</P>
-      <PRE><A name=o87></A>template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m1,
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m2);</PRE>
-      <P><B>Effects: </B>returns&nbsp;<CODE>m1.str() + m2.str()</CODE>.</P>
-      <h5>Stream inserter</h5>
-      <PRE><A name=oi></A>template &lt;class charT, class traits, class BidirectionalIterator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   operator &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m);</PRE>
-      <P>
-         <B>Effects: </B>returns <CODE>(os &lt;&lt; m.str())</CODE>.
-         <HR>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         22&nbsp;Dec 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/syntax.html b/doc/Attic/syntax.html
deleted file mode 100644
index e2b62f87..00000000
--- a/doc/Attic/syntax.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <P>This section covers the regular expression syntax used by this library, this is 
-         a programmers guide, the actual syntax presented to your program's users will 
-         depend upon the <A href="syntax_option_type.html">flags</A> used during 
-         expression compilation.
-      </P>
-      <P>There are three main syntax options available, depending upon how 
-         you&nbsp;construct the regular expression object:</P>
-      <UL>
-         <LI>
-            <A href="syntax_perl.html">Perl</A>&nbsp;(this is the default behavior).</LI>
-         <LI>
-            <A href="syntax_extended.html">POSIX extended</A> (including the <A href="syntax_extended.html#egrep">
-               egrep</A> and <A href="syntax_extended.html#awk">awk</A> variations).</LI>
-         <LI>
-            <A href="syntax_basic.html">POSIX Basic</A> (including the <A href="syntax_basic.html#grep">
-               grep</A> and <A href="syntax_basic.html#emacs">emacs</A> variations).</LI></UL>
-      <P>You can also construct a regular expression that treats every character as a <A href="syntax_option_type.html#literals">
-            literal</A>, but that's not really a "syntax"!</P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         10 Sept 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/syntax_basic.html b/doc/Attic/syntax_basic.html
deleted file mode 100644
index 14096c38..00000000
--- a/doc/Attic/syntax_basic.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: POSIX-Basic Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">POSIX Basic Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#Basic">POSIX Basic Syntax</A> <dt><A href="#variations">
-                     Variations</A>
-                  <dd>
-                     <dl>
-                        <dt><A href="#grep">Grep</A> <dt><A href="#emacs">Emacs</A></dt>
-                     </dl>
-                     <dt><A href="#options">Options</A> <dt><A href="#refs">References</A></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The POSIX-Basic regular expression syntax is used by the Unix utility <EM>sed</EM>, 
-         and variations are used by <EM>grep</EM> and <EM>emacs</EM>.&nbsp; You can 
-         construct POSIX basic regular expressions in Boost.Regex by passing the flag <EM>basic</EM>
-         to the regex constructor, for example:</P>
-      <PRE>// 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);</PRE>
-      <H3>POSIX Basic Syntax<A name="Basic"></A></H3>
-      <P>In POSIX-Basic regular expressions, all characters are match themselves except 
-         for the following special characters:</P>
-      <PRE>.[\*^$</PRE>
-      <H4>Wildcard:</H4>
-      <P>The single character '.' when used outside of a character set will match any 
-         single character except:</P>
-      <P>The NULL character when the flag <EM>match_no_dot_null</EM> is passed to the 
-         matching algorithms.</P>
-      <P>The newline character when the flag <EM>match_not_dot_newline</EM> is passed to 
-         the matching algorithms.</P>
-      <H4>Anchors:</H4>
-      <P>A '^' character shall match the start of a line when used as the first 
-         character of an expression, or the first character of a sub-expression.</P>
-      <P>A '$' character shall match the end of a line when used as the last character 
-         of an expression, or the last character of a sub-expression.</P>
-      <H4>Marked sub-expressions:</H4>
-      <P>A section beginning \( and ending \) acts as a marked sub-expression.&nbsp; 
-         Whatever matched the sub-expression is split out in a separate field by the 
-         matching algorithms.&nbsp; Marked sub-expressions can also repeated, or 
-         referred-to by a back-reference.</P>
-      <H4>Repeats:</H4>
-      <P>Any atom (a single character, a marked sub-expression, or a character class) 
-         can be repeated with the * operator.</P>
-      <P>For example a* will match any number of letter a's repeated zero or more times 
-         (an atom repeated zero times matches an empty string), so the expression a*b 
-         will match any of the following:</P>
-      <PRE>b
-ab
-aaaaaaaab</PRE>
-      <P>An atom can also be repeated with a bounded repeat:</P>
-      <P>a\{n\}&nbsp; Matches 'a' repeated exactly <EM>n</EM> times.</P>
-      <P>a\{n,\}&nbsp; Matches 'a' repeated <EM>n</EM> or more times.</P>
-      <P>a\{n, m\}&nbsp; Matches 'a' repeated between <EM>n</EM> and <EM>m</EM> times 
-         inclusive.</P>
-      <P>For example:</P>
-      <PRE>^a\{2,3\}$</PRE>
-      <P>Will match either of:</P>
-      <PRE>aa
-aaa</PRE>
-      <P>But neither of:</P>
-      <PRE>a
-aaaa</PRE>
-      <P>It is an error to use a repeat operator, if the preceding construct can not be 
-         repeated, for example:</P>
-      <PRE>a\(*\)</PRE>
-      <P>Will raise an error, as there is nothing for the * operator to be applied to.</P>
-      <H4>Back references:</H4>
-      <P>An escape character followed by a digit <EM>n</EM>, where <EM>n </EM>is in the 
-         range 1-9, matches the same string that was matched by sub-expression <EM>n</EM>.&nbsp; 
-         For example the expression:</P>
-      <PRE>^\(a*\).*\1$</PRE>
-      <P>Will match the string:</P>
-      <PRE>aaabbaaa</PRE>
-      <P>But not the string:</P>
-      <PRE>aaabba</PRE>
-      <H4>Character sets:</H4>
-      <P>A character set is a bracket-expression starting with [ and ending with ], it 
-         defines a set of characters, and matches any single character that is a member 
-         of that set.</P>
-      <P>A bracket expression may contain any combination of the following:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Single characters:</H5>
-         <P>For example [abc], will match any of the characters 'a', 'b', or 'c'.</P>
-         <H5>Character ranges:</H5>
-         <P>For example [a-c] will match any single character in the range 'a' to 
-            'c'.&nbsp; By default, for POSIX-Basic regular expressions, a character <EM>x</EM>
-            is within the range <EM>y</EM> to <EM>z</EM>, if it collates within that 
-            range;&nbsp;this results in locale specific behavior.&nbsp; This behavior can 
-            be turned off by unsetting the <EM><A href="syntax_option_type.html#basic">collate</A></EM>
-            option flag - in which case whether a character appears within a range is 
-            determined by comparing the code points of the characters only</P>
-         <H5>Negation:</H5>
-         <P>If the bracket-expression begins with the ^ character, then it matches the 
-            complement of the characters it contains, for example [^a-c] matches any 
-            character that is not in the range a-c.</P>
-         <H5>Character classes:</H5>
-         <P>An expression of the form [[:name:]] matches the named character class "name", 
-            for example [[:lower:]] matches any lower case character.&nbsp; See <A href="character_class_names.html">
-               character class names</A>.</P>
-         <H5>Collating Elements:</H5>
-         <P>An expression of the form [[.col.] matches the collating element <EM>col</EM>.&nbsp; 
-            A collating element is any single character, or any sequence of characters that 
-            collates as a single unit.&nbsp; Collating elements may also be used as the end 
-            point of a range, for example: [[.ae.]-c] matches the character sequence "ae", 
-            plus any single character in the rangle "ae"-c, assuming that "ae" is treated 
-            as a single collating element in the current locale.</P>
-         <P>Collating elements may be used in place of escapes (which are not normally 
-            allowed inside character sets), for example [[.^.]abc] would match either one 
-            of the characters 'abc^'.</P>
-         <P>As an extension, a collating element may also be specified via its <A href="collating_names.html">
-               symbolic name</A>, for example:</P>
-         <P>[[.NUL.]]</P>
-         <P>matches a NUL character.</P>
-         <H5>Equivalence classes:</H5>
-         <P>
-            An expression of theform[[=col=]], matches any character or collating element 
-            whose primary sort key is the same as that for collating element <EM>col</EM>, 
-            as with collating elements the name <EM>col</EM> may be a <A href="collating_names.html">
-               symbolic name</A>.&nbsp; A primary sort key is one that ignores case, 
-            accentation, or locale-specific tailorings; so for example [[=a=]] matches any 
-            of the characters: a, à, á, â, ã, ä, å, A, À, Á, Â, Ã, Ä and Å.&nbsp; 
-            Unfortunately implementation of this is reliant on the platform's collation and 
-            localisation support; this feature can not be relied upon to work portably 
-            across all platforms, or even all locales on one platform.</P>
-      </BLOCKQUOTE>
-      <H5>Combinations:</H5>
-      <P>All of the above can be combined in one character set declaration, for example: 
-         [[:digit:]a-c[.NUL.]].</P>
-      <H4>Escapes</H4>
-      <P>With the exception of the escape sequences \{, \}, \(, and \), which are 
-         documented above, an escape followed by any character matches that 
-         character.&nbsp; This can be used to make the special characters .[\*^$, 
-         "ordinary".&nbsp; Note that the escape character loses its special meaning 
-         inside a character set, so [\^] will match either a literal '\' or a '^'.</P>
-      <H4>What Gets Matched</H4>
-      <P>When there is more that one way to match a regular expression, the "best" 
-         possible match is obtained using the <A href="syntax_leftmost_longest.html">leftmost-longest 
-            rule</A>.</P>
-      <H3><A name="variations"></A>Variations</H3>
-      <H4><A name="grep"></A>Grep</H4>
-      <P>When an expression is compiled with the flag <EM>grep</EM> set, then the 
-         expression is treated as a newline separated list of <A href="#Basic">POSIX-Basic</A>
-         expressions, a match is found if any of the expressions in the list match, for 
-         example:</P>
-      <PRE>boost::regex e("abc\ndef", boost::regex::grep);</PRE>
-      <P>will match either of the POSIX-Basic expressions "abc" or "def".</P>
-      <P>As its name suggests, this behavior is consistent with the Unix utility <EM>grep</EM>.</P>
-      <H4><A name="emacs"></A>emacs</H4>
-      <P>In addition to the <A href="#Basic">POSIX-Basic features</A> the following 
-         characters are also special:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>+ repeats the preceding atom one or more times.</P>
-         <P>? repeats the preceding atom zero or one times.</P>
-         <P>*? A non-greedy version of *.</P>
-         <P>+? A non-greedy version of +.</P>
-         <P>?? A non-greedy version of ?.</P>
-      </BLOCKQUOTE>
-      <P>And the following escape sequences are also recognised:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>\| specifies an alternative.</P>
-         <P>\(?:&nbsp; ...&nbsp; \) is a non-marking grouping construct - allows you to 
-            lexically group something without spitting out an extra sub-expression.</P>
-         <P>\w&nbsp; matches any word character.</P>
-         <P>\W matches any non-word character.</P>
-         <P>\sx matches any character in the syntax group <EM>x</EM>, the following emacs 
-            groupings are supported: 's', ' ', '_', 'w', '.', ')', '(', '"', '\'', '&gt;' 
-            and '&lt;'.&nbsp; Refer to the emacs docs for details.</P>
-         <P>\Sx matches any character not in the syntax grouping <EM>x</EM>.</P>
-         <P>\c and \C are not supported.</P>
-         <P>\` matches zero characters only at the start of a buffer (or string being 
-            matched).</P>
-         <P>\' matches zero characters only at the end of a buffer (or string being 
-            matched).</P>
-         <P>\b matches zero characters at a word boundary.</P>
-         <P>\B matches zero characters, not at a word boundary.</P>
-         <P>\&lt; matches zero characters only at the start of a word.</P>
-         <P>\&gt; matches zero characters only at the end of a word.</P>
-      </BLOCKQUOTE>
-      <P dir="ltr">Finally, you should note that emacs style regular expressions are 
-         matched according to the <A href="syntax_perl.html#what">Perl "depth first search" 
-            rules</A>.&nbsp; Emacs expressions are matched this way because they contain 
-         Perl-like extensions, that do not interact well with the <A href="syntax_leftmost_longest.html">
-            POSIX-style leftmost-longest rule</A>.</P>
-      <H3><A name="options"></A>Options</H3>
-      <P>There are a <A href="syntax_option_type.html#basic">variety of flags</A> that 
-         may be combined with the <EM>basic</EM> and <EM>grep</EM> options when 
-         constructing the regular expression, in particular note that the <A href="syntax_option_type.html#basic">
-            newline_alt, no_char_classes, no-intervals, bk_plus_qm and bk_plus_vbar</A> options 
-         all alter the syntax, while the <A href="syntax_option_type.html#basic">collate 
-            and icase</A> options modify how the case and locale sensitivity are to be 
-         applied.</P>
-      <H3><A name="refs"></A>References</H3>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html">IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions 
-            and Headers, Section 9, Regular Expressions (FWD.1).</A></P>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html">IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-            Utilities, Section 4, Utilities, grep (FWD.1).</A></P>
-      <P><A href="http://www.gnu.org/software/emacs/">Emacs Version 21.3</A>.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21 Aug 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;2004</I></P>
-      <I>
-         <P><I>Use, modification and distribution are subject to the Boost Software License, 
-               Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-               or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>).</I></P>
-      </I>
-   </body>
-</html>
diff --git a/doc/Attic/syntax_extended.html b/doc/Attic/syntax_extended.html
deleted file mode 100644
index d9253166..00000000
--- a/doc/Attic/syntax_extended.html
+++ /dev/null
@@ -1,520 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: POSIX-Extended Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">POSIX-Extended Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#extended">POSIX&nbsp;Extended Syntax</A>
-               <dt><A href="#variations">Variations</A>
-                  <dd>
-                     <dl>
-                        <dt><A href="#egrep">egrep</A> <dt><A href="#awk">awk</A>&nbsp;</dt>
-                     </dl>
-                     <dt><A href="#options">Options</A> <dt><A href="#refs">References</A></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The POSIX-Extended regular expression syntax is supported by the POSIX C 
-         regular expression API's, and variations are used by the utilities <EM>egrep</EM>
-         and <EM>awk</EM>. You can construct POSIX extended regular expressions in 
-         Boost.Regex by passing the flag <EM>extended</EM> to the regex constructor, for 
-         example:</P>
-      <PRE>// 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);</PRE>
-      <H3>POSIX Extended Syntax<A name="extended"></A></H3>
-      <P>In POSIX-Extended regular expressions, all characters match themselves except 
-         for the following special characters:</P>
-      <PRE>.[{()\*+?|^$</PRE>
-      <H4>Wildcard:</H4>
-      <P>The single character '.' when used outside of a character set will match any 
-         single character except:</P>
-      <P>The NULL character when the flag <EM>match_no_dot_null</EM> is passed to the 
-         matching algorithms.</P>
-      <P>The newline character when the flag <EM>match_not_dot_newline</EM> is passed to 
-         the matching algorithms.</P>
-      <H4>Anchors:</H4>
-      <P>A '^' character shall match the start of a line when used as the first 
-         character of an expression, or the first character of a sub-expression.</P>
-      <P>A '$' character shall match the end of a line when used as the last character 
-         of an expression, or the last character of a sub-expression.</P>
-      <H4>Marked sub-expressions:</H4>
-      <P>A section beginning ( and ending ) acts as a marked sub-expression.&nbsp; 
-         Whatever matched the sub-expression is split out in a separate field by the 
-         matching algorithms.&nbsp; Marked sub-expressions can also repeated, or 
-         referred to by a back-reference.</P>
-      <H4>Repeats:</H4>
-      <P>Any atom (a single character, a marked sub-expression, or a character class) 
-         can be repeated with the *, +, ?, and {}&nbsp;operators.</P>
-      <P>The * operator will match the preceding atom zero or more times, for example 
-         the expression a*b will match any of the following:</P>
-      <PRE>b
-ab
-aaaaaaaab</PRE>
-      <P>The + operator will match the preceding atom one or more times, for example the 
-         expression a+b will match any of the following:</P>
-      <PRE>ab
-aaaaaaaab</PRE>
-      <P>But will not match:</P>
-      <PRE>b</PRE>
-      <P>The ? operator will match the preceding atom zero or&nbsp;one times, for 
-         example the expression ca?b will match any of the following:</P>
-      <PRE>cb
-cab</PRE>
-      <P>But will not match:</P>
-      <PRE>caab</PRE>
-      <P>An atom can also be repeated with a bounded repeat:</P>
-      <P>a{n}&nbsp; Matches 'a' repeated exactly <EM>n</EM> times.</P>
-      <P>a{n,}&nbsp; Matches 'a' repeated <EM>n</EM> or more times.</P>
-      <P>a{n, m}&nbsp; Matches 'a' repeated between <EM>n</EM> and <EM>m</EM> times 
-         inclusive.</P>
-      <P>For example:</P>
-      <PRE>^a{2,3}$</PRE>
-      <P>Will match either of:</P>
-      <PRE>aa
-aaa</PRE>
-      <P>But neither of:</P>
-      <PRE>a
-aaaa</PRE>
-      <P>It is an error to use a repeat operator, if the preceding construct can not be 
-         repeated, for example:</P>
-      <PRE>a(*)</PRE>
-      <P>Will raise an error, as there is nothing for the * operator to be applied to.</P>
-      <H4>Back references:</H4>
-      <P>An escape character followed by a digit <EM>n</EM>, where <EM>n </EM>is in the 
-         range 1-9, matches the same string that was matched by sub-expression <EM>n</EM>.&nbsp; 
-         For example the expression:</P>
-      <PRE>^(a*).*\1$</PRE>
-      <P>Will match the string:</P>
-      <PRE>aaabbaaa</PRE>
-      <P>But not the string:</P>
-      <PRE>aaabba</PRE>
-      <P><EM><STRONG>Caution</STRONG>: the POSIX standard does not support back-references 
-            for "extended" regular expressions, this is a compatible extension to that 
-            standard.</EM></P>
-      <H4>Alternation</H4>
-      <P>The | operator will match either of its arguments, so for example: abc|def will 
-         match either "abc" or "def".&nbsp;
-      </P>
-      <P>Parenthesis can be used to group alternations, for example: ab(d|ef) will match 
-         either of "abd" or "abef".</P>
-      <H4>Character sets:</H4>
-      <P>A character set is a bracket-expression starting with [ and ending with ], it 
-         defines a set of characters, and matches any single character that is a member 
-         of that set.</P>
-      <P>A bracket expression may contain any combination of the following:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Single characters:</H5>
-         <P>For example [abc], will match any of the characters 'a', 'b', or 'c'.</P>
-         <H5>Character ranges:</H5>
-         <P>For example [a-c] will match any single character in the range 'a' to 
-            'c'.&nbsp; By default, for POSIX-Extended regular expressions, a character <EM>x</EM>
-            is within the range <EM>y</EM> to <EM>z</EM>, if it collates within that 
-            range;&nbsp;<EM><STRONG>this results in locale specific behavior</STRONG></EM> .&nbsp; 
-            This behavior can be turned off by unsetting the <EM><A href="syntax_option_type.html#extended">
-                  collate</A></EM> option flag - in which case whether a character appears 
-            within a range is determined by comparing the code points of the characters 
-            only.</P>
-         <H5>Negation:</H5>
-         <P>If the bracket-expression begins with the ^ character, then it matches the 
-            complement of the characters it contains, for example [^a-c] matches any 
-            character that is not in the range a-c.</P>
-         <H5>Character classes:</H5>
-         <P>An expression of the form [[:name:]] matches the named character class "name", 
-            for example [[:lower:]] matches any lower case character.&nbsp; See <A href="character_class_names.html">
-               character class names</A>.</P>
-         <H5>Collating Elements:</H5>
-         <P>An expression of the form [[.col.] matches the collating element <EM>col</EM>.&nbsp; 
-            A collating element is any single character, or any sequence of characters that 
-            collates as a single unit.&nbsp; Collating elements may also be used as the end 
-            point of a range, for example: [[.ae.]-c] matches the character sequence "ae", 
-            plus any single character in the range "ae"-c, assuming that "ae" is treated as 
-            a single collating element in the current locale.</P>
-         <P>Collating elements may be used in place of escapes (which are not normally 
-            allowed inside character sets), for example [[.^.]abc] would match either one 
-            of the characters 'abc^'.</P>
-         <P>As an extension, a collating element may also be specified via its <A href="collating_names.html">
-               symbolic name</A>, for example:</P>
-         <P>[[.NUL.]]</P>
-         <P>matches a NUL character.</P>
-         <H5>Equivalence classes:</H5>
-         <P>
-            An expression oftheform[[=col=]], matches any character or collating element 
-            whose primary sort key is the same as that for collating element <EM>col</EM>, 
-            as with colating elements the name <EM>col</EM> may be a <A href="collating_names.html">
-               symbolic name</A>.&nbsp; A primary sort key is one that ignores case, 
-            accentation, or locale-specific tailorings; so for example [[=a=]] matches any 
-            of the characters: a, à, á, â, ã, ä, å, A, À, Á, Â, Ã, Ä and Å.&nbsp; 
-            Unfortunately implementation of this is reliant on the platform's collation and 
-            localisation support; this feature can not be relied upon to work portably 
-            across all platforms, or even all locales on one platform.</P>
-      </BLOCKQUOTE>
-      <H5>Combinations:</H5>
-      <P>All of the above can be combined in one character set declaration, for example: 
-         [[:digit:]a-c[.NUL.]].</P>
-      <H4>Escapes</H4>
-      <P>The POSIX standard defines no escape sequences for POSIX-Extended regular 
-         expressions, except that:</P>
-      <UL>
-         <LI>
-         Any special character preceded by an escape shall match itself.
-         <LI>
-         The effect of any ordinary character being preceded by an escape is undefined.
-         <LI>
-            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 [\^] will match either a literal '\' or a '^'.</LI></UL>
-      <P>However, that's rather restrictive, so the following standard-compatible 
-         extensions are also supported by Boost.Regex:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Escapes matching a specific character</H5>
-         <P>The following escape sequences are all synonyms for single characters:</P>
-         <P>
-            <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD><STRONG>Escape</STRONG></TD>
-                  <TD><STRONG>Character</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\a</TD>
-                  <TD>'\a'</TD>
-               </TR>
-               <TR>
-                  <TD>\e</TD>
-                  <TD>0x1B</TD>
-               </TR>
-               <TR>
-                  <TD>\f</TD>
-                  <TD>\f</TD>
-               </TR>
-               <TR>
-                  <TD>\n</TD>
-                  <TD>\n</TD>
-               </TR>
-               <TR>
-                  <TD>\r</TD>
-                  <TD>\r</TD>
-               </TR>
-               <TR>
-                  <TD>\t</TD>
-                  <TD>\t</TD>
-               </TR>
-               <TR>
-                  <TD>\v</TD>
-                  <TD>\v</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>\b (but only inside a character class declaration).</TD>
-               </TR>
-               <TR>
-                  <TD>\cX</TD>
-                  <TD>An ASCII escape sequence - the character whose code point is X % 32</TD>
-               </TR>
-               <TR>
-                  <TD>\xdd</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdd.</TD>
-               </TR>
-               <TR>
-                  <TD>\x{dddd}</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\0ddd</TD>
-                  <TD>An octal escape sequence - matches the single character whose code point is 
-                     0ddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\N{Name}</TD>
-                  <TD>Matches the single character which has the <A href="collating_names.html">symbolic 
-                        name</A> <EM>name.&nbsp; </EM>For example \N{newline} matches the single 
-                     character \n.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>"Single character" character&nbsp;classes:</H5>
-         <P>Any escaped character <EM>x</EM>, if <EM>x</EM> is the name of a character 
-            class shall match any character that is a member of that class, and any escaped 
-            character <EM>X</EM>, if <EM>x</EM> is the name of a character class, shall 
-            match any character not in that class.</P>
-         <P>The following are supported by default:</P>
-         <P>
-            <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="300" border="1">
-               <TR>
-                  <TD><STRONG>Escape sequence</STRONG></TD>
-                  <TD><STRONG>Equivalent to</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\d</TD>
-                  <TD>[[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\l</TD>
-                  <TD>[[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\s</TD>
-                  <TD>[[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\u</TD>
-                  <TD>[[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\w</TD>
-                  <TD>[[:word:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\D</TD>
-                  <TD>[^[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\L</TD>
-                  <TD>[^[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\S</TD>
-                  <TD>[^[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\U</TD>
-                  <TD>[^[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\W</TD>
-                  <TD>[^[:word:]]</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>
-            <H5>Character Properties</H5>
-         </H5>
-         <P dir="ltr">The character property names in the following table are all 
-            equivalent to the <A href="character_class_names.html">names used in character 
-               classes</A>.</P>
-         <H5>
-            <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="0">
-               <TR>
-                  <TD><STRONG>Form</STRONG></TD>
-                  <TD><STRONG>Description</STRONG></TD>
-                  <TD><STRONG>Equivalent character set form</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\pX</TD>
-                  <TD>Matches any character that has the property X.</TD>
-                  <TD>[[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\p{Name}</TD>
-                  <TD>Matches any character that has the property <EM>Name</EM>.</TD>
-                  <TD>[[:Name:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\PX</TD>
-                  <TD>Matches any character that does not have the property X.</TD>
-                  <TD>[^[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\P{Name}</TD>
-                  <TD>Matches any character that does not have the property <EM>Name</EM>.</TD>
-                  <TD>[^[:Name:]]</TD>
-               </TR>
-            </TABLE>
-         </H5>
-         <H5>Word Boundaries</H5>
-         <P>The following escape sequences match the boundaries of words:</P>
-         <P>
-            <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\&lt;</TD>
-                  <TD>Matches the start of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\&gt;</TD>
-                  <TD>Matches the end of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>Matches a word boundary (the start or end of a word).</TD>
-               </TR>
-               <TR>
-                  <TD>\B</TD>
-                  <TD>Matches only when not at a word boundary.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Buffer boundaries</H5>
-         <P>The following match only at buffer boundaries: a "buffer" in this context is 
-            the whole of the input text&nbsp;that is being matched against (note that ^ and 
-            $ may match embedded newlines within the text).</P>
-         <P>
-            <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\`</TD>
-                  <TD>Matches at the start of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\'</TD>
-                  <TD>Matches at the end of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\A</TD>
-                  <TD>Matches at the start of a buffer only (the same as \`).</TD>
-               </TR>
-               <TR>
-                  <TD>\z</TD>
-                  <TD>Matches at the end of a buffer only (the same as \').</TD>
-               </TR>
-               <TR>
-                  <TD>\Z</TD>
-                  <TD>Matches an optional sequence of newlines at the end of a buffer: equivalent to 
-                     the regular expression \n*\z</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Continuation Escape</H5>
-         <P>The sequence \G matches only at the end of the last match found, or at the 
-            start of the text being matched if no previous match was found.&nbsp; This 
-            escape useful if you're iterating over the matches contained within a text, and 
-            you want each subsequence match to start where the last one ended.</P>
-         <H5>Quoting escape</H5>
-         <P>The escape sequence \Q begins a "quoted sequence": all the subsequent 
-            characters are treated as literals, until either the end of the regular 
-            expression or \E is found.&nbsp; For example the expression: \Q\*+\Ea+ would 
-            match either of:</P>
-         <PRE>\*+a<BR>\*+aaa</PRE>
-         <H5>Unicode escapes</H5>
-         <P>
-            <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\C</TD>
-                  <TD>Matches a single code point: in Boost regex this has exactly the same effect 
-                     as a "." operator.</TD>
-               </TR>
-               <TR>
-                  <TD>\X</TD>
-                  <TD>Matches a combining character sequence: that is any non-combining character 
-                     followed by a sequence of zero or more combining characters.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Any other escape</H5>
-         <P>Any other escape sequence matches the character that is escaped, for example \@ 
-            matches a literal <A href="mailto:'@'">'@'</A>.</P>
-      </BLOCKQUOTE><A name="variations">
-         <H4>Operator precedence</H4>
-         <P>&nbsp;The order of precedence for of operators is as shown in the following 
-            table:</P>
-         <P>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>Collation-related bracket symbols</TD>
-                  <TD>[==] [::] [..]</TD>
-               </TR>
-               <TR>
-                  <TD>Escaped characters
-                  </TD>
-                  <TD>\</TD>
-               </TR>
-               <TR>
-                  <TD>Character set&nbsp;(bracket expression)
-                  </TD>
-                  <TD>[]</TD>
-               </TR>
-               <TR>
-                  <TD>Grouping</TD>
-                  <TD>()</TD>
-               </TR>
-               <TR>
-                  <TD>Single-character-ERE duplication
-                  </TD>
-                  <TD>* + ? {m,n}</TD>
-               </TR>
-               <TR>
-                  <TD>Concatenation</TD>
-                  <TD></TD>
-               </TR>
-               <TR>
-                  <TD>Anchoring</TD>
-                  <TD>^$</TD>
-               </TR>
-               <TR>
-                  <TD>Alternation</TD>
-                  <TD>|</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </A>
-      <H4>What Gets Matched</H4>
-      <P>When there is more that one way to match a regular expression, the "best" 
-         possible match is obtained using the <A href="syntax_leftmost_longest.html">leftmost-longest 
-            rule</A>.</P>
-      <H3>Variations</H3>
-      <H4>Egrep<A name="egrep"></H4>
-      <P>When an expression is compiled with the flag <EM>egrep</EM> set, then the 
-         expression is treated as a newline separated list of POSIX-Extended 
-         expressions, a match is found if any of the expressions in the list match, for 
-         example:</P>
-      <PRE>boost::regex e("abc\ndef", boost::regex::egrep);</PRE>
-      <P>will match either of the POSIX-Basic expressions "abc" or "def".</P>
-      <P>As its name suggests, this behavior is consistent with the Unix utility <EM>egrep</EM>, 
-         and with <EM>grep</EM> when used with the -E option.</P>
-      <H4>awk<A name="awk"></A></H4>
-      <P>In addition to the <A href="#extended">POSIX-Extended features</A>&nbsp;the 
-         escape character is special inside a character class declaration.&nbsp;</P>
-      <P>In addition, some escape sequences that are not defined as part of 
-         POSIX-Extended specification are required to be supported - however Boost.Regex 
-         supports these by default anyway.</P>
-      <H3><A name="options"></A>Options</H3>
-      <P>There are a <A href="syntax_option_type.html#extended">variety of flags</A> that 
-         may be combined with the <EM>extended</EM> and <EM>egrep</EM> options when 
-         constructing the regular expression, in particular note that the <A href="syntax_option_type.html#extended">
-            newline_alt</A> option alters the syntax, while the <A href="syntax_option_type.html#extended">
-            collate, nosubs&nbsp;and icase</A> options modify how the case and locale 
-         sensitivity are to be applied.</P>
-      <H3><A name="refs">References</H3>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html"> IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions 
-            and Headers, Section 9, Regular Expressions.</A></P>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html"> IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-            Utilities, Section 4, Utilities, egrep.</A></P>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/utilities/awk.html">IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-            Utilities, Section 4, Utilities, awk.</A></P>
-      <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21 Aug 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;2004</I></P>
-      <I>
-         <P><I>Use, modification and distribution are subject to the Boost Software License, 
-               Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-               or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>).</I></P>
-      </I>
-   </body>
-</html>
diff --git a/doc/Attic/syntax_leftmost_longest.html b/doc/Attic/syntax_leftmost_longest.html
deleted file mode 100644
index 6330fc5f..00000000
--- a/doc/Attic/syntax_leftmost_longest.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Index</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">The "Leftmost Longest" Rule</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Often there is more than one way of matching a regular expression at a 
-         particular location, for POSIX basic and extended regular expressions, the 
-         "best" match is determined as follows:</P>
-      <OL>
-         <LI>
-            Find the leftmost match, if there is only one match possible at this location 
-            then return it.</LI>
-         <LI>
-            Find the longest of the possible matches, along with any ties.&nbsp; If there 
-            is only one such possible match then return it.</LI>
-         <LI>
-            If there are no marked sub-expressions, then all the remaining alternatives are 
-            indistinguishable; return the first of these found.</LI>
-         <LI>
-            Find the match which has matched the first sub-expression in the leftmost 
-            position, along with any ties.&nbsp; If there is only on such match possible 
-            then return it.</LI>
-         <LI>
-            Find the match which has the longest match for the first sub-expression, along 
-            with any ties.&nbsp; If there is only one such match then return it.</LI>
-         <LI>
-            Repeat steps 3 and 4 for each additional marked sub-expression.</LI>
-         <LI>
-            If there is still more than one possible match remaining, then they are 
-            indistinguishable; return the first one found.</LI></OL>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         16 Dec 2004</p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Attic/syntax_option_type.html b/doc/Attic/syntax_option_type.html
deleted file mode 100644
index fbd5cdbe..00000000
--- a/doc/Attic/syntax_option_type.html
+++ /dev/null
@@ -1,543 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: syntax_option_type</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">syntax_option_type</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="#perl">Options for Perl Regular Expressions</a> <dt><a href="#extended">Options 
-                              for POSIX Extended Regular Expressions</a> <dt><a href="#basic">Options for POSIX 
-                                 Basic Regular Expressions</a> <dt><a href="#literals">Options for String Literals</a></dt>
-                  </dl>
-               </dd>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>Type syntax_option type is an implementation specific bitmask type that 
-         controls how a regular expression string is to be interpreted.&nbsp; For 
-         convenience note that all the constants listed here, are also duplicated within 
-         the scope of class template <A href="basic_regex.html">basic_regex</A>.</P>
-      <PRE>namespace std{ namespace regex_constants{
-
-typedef <EM>implementation-specific-bitmask-type</EM> syntax_option_type;<BR>
-// 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;
-static const syntax_option_type perl = normal;<BR>static const syntax_option_type basic;
-static const syntax_option_type sed = basic;
-static const syntax_option_type extended;
-static const syntax_option_type awk;
-static const syntax_option_type grep;
-static const syntax_option_type egrep;
-static const syntax_option_type icase;
-static const syntax_option_type nosubs;
-static const syntax_option_type optimize;
-static const syntax_option_type collate;
-// other boost.regex specific options are listed below<BR>
-} // namespace regex_constants
-} // namespace std</PRE>
-      <H3><A name="description"></A>Description</H3>
-      <P>The type <CODE>syntax_option_type</CODE> is an implementation specific bitmask 
-         type (17.3.2.1.2). Setting its elements has the effects listed in the table 
-         below, a valid value of type <CODE>syntax_option_type</CODE> will always have 
-         exactly one of the elements <CODE>normal, basic, extended, awk, grep, egrep, sed, 
-            literal&nbsp;or perl</CODE> set.</P>
-      <P>Note that for convenience all the constants listed here are duplicated within 
-         the scope of class template basic_regex, so you can use any of:</P>
-      <PRE>boost::regex_constants::constant_name</PRE>
-      <P>or</P>
-      <PRE>boost::regex::constant_name</PRE>
-      <P>or</P>
-      <PRE>boost::wregex::constant_name</PRE>
-      <P>in an interchangeable manner.</P>
-      <H4><A name="perl"></A>Options for Perl Regular Expressions:</H4>
-      <P>One of the following must always be set for perl regular expressions:</P>
-      <P>
-         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>ECMAScript</P>
-               </TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine uses its 
-                     normal semantics: that is the same as that given in the ECMA-262, ECMAScript 
-                     Language Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects 
-                     (FWD.1).</P>
-                  <P>boost.regex also recognizes all of the perl-compatible (?...) extensions in 
-                     this mode.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>perl</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-            <TR>
-               <TD>normal</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-            <TR>
-               <TD>JavaScript</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-            <TR>
-               <TD>JScript</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be set when using perl-style regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>nosubs</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that when a regular expression is matched against a character 
-                     container sequence, then no sub-expression matches are to be stored in the 
-                     supplied match_results structure.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     Boost.Regex.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>collate</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>newline_alt</TD>
-               <TD>No</TD>
-               <TD>Specifies that the \n character has the same effect as the alternation 
-                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
-                  alternatives.</TD>
-            </TR>
-            <TR>
-               <TD>no_except</TD>
-               <TD>No</TD>
-               <TD>Prevents basic_regex from throwing an exception when an invalid expression is 
-                  encountered.</TD>
-            </TR>
-            <TR>
-               <TD>no_mod_m</TD>
-               <TD>No</TD>
-               <TD>Normally Boost.Regex behaves as if the Perl m-modifier is on: so the 
-                  assertions ^ and $ match after and before embedded newlines respectively, 
-                  setting this flags is equivalent to prefixing the expression with (?-m).</TD>
-            </TR>
-            <TR>
-               <TD>no_mod_s</TD>
-               <TD>No</TD>
-               <TD>Normally whether Boost.Regex will match "." against a newline character is 
-                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
-                  Specifying this flag is equivalent to prefixing the expression with (?-s) and 
-                  therefore causes "." not to match a newline character regardless of whether 
-                  match_not_dot_newline is set in the match flags.</TD>
-            </TR>
-            <TR>
-               <TD>mod_s</TD>
-               <TD>No</TD>
-               <TD>Normally whether Boost.Regex will match "." against a newline character is 
-                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
-                  Specifying this flag is equivalent to prefixing the expression with (?s) and 
-                  therefore causes "." to match a newline character regardless of whether 
-                  match_not_dot_newline is set in the match flags.</TD>
-            </TR>
-            <TR>
-               <TD>mod_x</TD>
-               <TD>No</TD>
-               <TD>Turns on the perl x-modifier: causes unescaped whitespace in the expression to 
-                  be ignored.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4><A name="extended"></A>Options for POSIX Extended Regular Expressions:</H4>
-      <P>Exactly one of the following must always be set for POSIX extended regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect when set</TD>
-            </TR>
-            <TR>
-               <TD>extended</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX extended regular expressions in IEEE Std 
-                     1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions and 
-                     Headers, Section 9, Regular Expressions (FWD.1).&nbsp;
-                  </P>
-                  <P>In addition some perl-style escape sequences are supported (The POSIX standard 
-                     specifies that only "special" characters may be escaped, all other escape 
-                     sequences result in undefined behavior).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>egrep</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility grep when given the -E option in IEEE Std 
-                     1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-                     Utilities, Section 4, Utilities, grep (FWD.1).</P>
-                  <P>That is to say, the same as POSIX extended syntax, but with the newline 
-                     character acting as an alternation character in addition to "|".</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>awk</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility awk in IEEE Std 1003.1-2001, Portable 
-                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, awk 
-                     (FWD.1).</P>
-                  <P>That is to say: the same as POSIX extended syntax, but with escape sequences in 
-                     character classes permitted.</P>
-                  <P>In addition some perl-style escape sequences are supported (actually the awk 
-                     syntax only requires \a \b \t \v \f \n and \r to be recognised,&nbsp;all other 
-                     Perl-style escape sequences invoke undefined behavior according to the POSIX 
-                     standard, but are in fact recognised by Boost.Regex).</P>
-               </TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be set when using POSIX extended regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>nosubs</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that when a regular expression is matched against a character 
-                     container sequence, then no sub-expression matches are to be stored in the 
-                     supplied match_results structure.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     boost.regex.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>collate</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that character ranges of the form "[a-b]" should be locale 
-                     sensitive.&nbsp; <STRONG>This bit is</STRONG> <STRONG>on by default</STRONG> for 
-                     POSIX-Extended regular expressions, but can be unset to force ranges to be 
-                     compared by code point only.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>newline_alt</TD>
-               <TD>No</TD>
-               <TD>Specifies that the \n character has the same effect as the alternation 
-                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
-                  alternatives.</TD>
-            </TR>
-            <TR>
-               <TD>no_escape_in_lists</TD>
-               <TD>No</TD>
-               <TD>When set this makes the escape character ordinary inside lists, so that [\b] 
-                  would match either '\' or 'b'. <STRONG>This bit is one by default</STRONG> for 
-                  POSIX-Extended regular expressions, but can be unset to force escapes to be 
-                  recognised inside lists.</TD>
-            </TR>
-            <TR>
-               <TD>no_bk_refs</TD>
-               <TD>No</TD>
-               <TD>When set then backreferences are disabled.&nbsp; <STRONG>This bit is</STRONG> <STRONG>
-                     on by default</STRONG> for POSIX-Extended regular expressions, but can be 
-                  unset to support for backreferences on.</TD>
-            </TR>
-            <TR>
-               <TD>no_except</TD>
-               &nbsp;<TD>
-               <TD></TD>
-               <TD>No</TD>
-               <TD>Prevents basic_regex from throwing an exception when an invalid expression is 
-                  encountered.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4><A name="basic"></A>Options for POSIX Basic Regular Expressions:</H4>
-      <P>Exactly one of the following must always be set for POSIX basic regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table8" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect When Set</TD>
-            </TR>
-            <TR>
-               <TD>basic</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by <A href="syntax_basic.html#Basic">POSIX basic regular 
-                        expressions</A> in IEEE Std 1003.1-2001, Portable Operating System Interface 
-                     (POSIX ), Base Definitions and Headers, Section 9, Regular Expressions (FWD.1).
-                  </P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>sed</TD>
-               <TD>No</TD>
-               <TD>As Above.</TD>
-            </TR>
-            <TR>
-               <TD>grep</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by <A href="syntax_basic.html#grep">POSIX utility grep</A> in 
-                     IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-                     Utilities, Section 4, Utilities, grep (FWD.1).</P>
-                  <P>That is to say, the same as POSIX basic syntax, but with the newline character 
-                     acting as an alternation character; the expression is treated as a newline 
-                     separated list of alternatives.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>emacs</TD>
-               <TD>No</TD>
-               <TD>Specifies that the grammar recognised is the superset of the POSIX-Basic 
-                  syntax used by the <A href="syntax_basic.html#emacs">emacs</A> program.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be set when using POSIX basic regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>nosubs</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that when a regular expression is matched against a character 
-                     container sequence, then no sub-expression matches are to be stored in the 
-                     supplied match_results structure.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     boost.regex.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>collate</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that character ranges of the form "[a-b]" should be locale 
-                     sensitive.&nbsp; <STRONG>This bit is</STRONG> <STRONG>on by default</STRONG> for 
-                     POSIX-Basic regular expressions, but can be unset to force ranges to be 
-                     compared by code point only.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>newline_alt</TD>
-               <TD>No</TD>
-               <TD>Specifies that the \n character has the same effect as the alternation 
-                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
-                  alternatives.&nbsp; This bit is already set, if you use the <EM>grep</EM> option.</TD>
-            </TR>
-            <TR>
-               <TD>no_char_classes</TD>
-               <TD>No</TD>
-               <TD>When set then character classes such as [[:alnum:]] are not allowed.</TD>
-            </TR>
-            <TR>
-               <TD>no_escape_in_lists</TD>
-               <TD>No</TD>
-               <TD>When set this makes the escape character ordinary inside lists, so that [\b] 
-                  would match either '\' or 'b'. <STRONG>This bit is one by default</STRONG> for 
-                  POSIX-basic regular expressions, but can be unset to force escapes to be 
-                  recognised inside lists.</TD>
-            </TR>
-            <TR>
-               <TD>no_intervals</TD>
-               <TD>No</TD>
-               <TD>When set then bounded repeats such as a{2,3} are not permitted.</TD>
-            </TR>
-            <TR>
-               <TD>bk_plus_qm</TD>
-               <TD>No</TD>
-               <TD>When set then \? acts as a zero-or-one repeat operator, and \+ acts as a 
-                  one-or-more repeat operator.</TD>
-            </TR>
-            <TR>
-               <TD>bk_vbar</TD>
-               <TD>No</TD>
-               <TD>When set then \| acts as the alternation operator.</TD>
-            </TR>
-            <TR>
-               <TD>no_except</TD>
-               <TD>
-               <TD></TD>
-               <TD>No</TD>
-               <TD>Prevents basic_regex from throwing an exception when an invalid expression is 
-                  encountered.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4><A name="literals"></A>Options for Literal Strings:</H4>
-      <P>The following must always be set to interpret the expression as a string 
-         literal:</P>
-      <P>
-         <TABLE id="Table10" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect when set</TD>
-            </TR>
-            <TR>
-               <TD>literal</TD>
-               <TD>Yes</TD>
-               <TD>Treat the string as a literal (no special characters).</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be combined with the <EM>literal</EM> flag:</P>
-      <P>
-         <TABLE id="Table11" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect when set</TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     boost.regex.</P>
-               </TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>&nbsp;</P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         23 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/syntax_perl.html b/doc/Attic/syntax_perl.html
deleted file mode 100644
index 3eda0385..00000000
--- a/doc/Attic/syntax_perl.html
+++ /dev/null
@@ -1,626 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Perl Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">
-                     Perl&nbsp;Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#Perl">Perl&nbsp;Syntax</A> <dt><A href="#what">
-                     What Gets Matched</A> <dt><A href="#variations">Variations</A>
-                     <dd>
-                        <dt><A href="#options">Options</A> <dt><A href="#mods">Modifiers</A> <dt><A href="#refs">References</A></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The Perl regular expression syntax is based on that used by the programming 
-         language <EM>Perl</EM> .&nbsp; Perl regular expressions are the default 
-         behavior in Boost.Regex or you can&nbsp;pass the flag <EM>perl</EM> to the 
-         regex constructor, for example:</P>
-      <PRE>// 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);</PRE>
-      <H3>Perl&nbsp;Regular Expression Syntax<A name="Perl"></A></H3>
-      <P>In&nbsp;Perl regular expressions, all characters match themselves except for 
-         the following special characters:</P>
-      <PRE>.[{()\*+?|^$</PRE>
-      <H4>Wildcard:</H4>
-      <P>The single character '.' when used outside of a character set will match any 
-         single character except:</P>
-      <P>The NULL character when the flag <EM>match_no_dot_null</EM> is passed to the 
-         matching algorithms.</P>
-      <P>The newline character when the flag <EM>match_not_dot_newline</EM> is passed to 
-         the matching algorithms.</P>
-      <H4>Anchors:</H4>
-      <P>A '^' character shall match the start of a line.</P>
-      <P>A '$' character shall match the end of a line.</P>
-      <H4>Marked sub-expressions:</H4>
-      <P>A section beginning ( and ending ) acts as a marked sub-expression.&nbsp; 
-         Whatever matched the sub-expression is split out in a separate field by the 
-         matching algorithms.&nbsp; Marked sub-expressions can also repeated, or 
-         referred to by a back-reference.</P>
-      <H4>Non-marking grouping:</H4>
-      <P>A marked sub-expression is useful to lexically group part of a regular 
-         expression, but has the side-effect of spitting out an extra field in the 
-         result.&nbsp; As an alternative&nbsp;you can lexically group part of a regular 
-         expression, without generating a marked sub-expression by using (?: and ) , for 
-         example (?:ab)+ will repeat "ab" without splitting out any separate 
-         sub-expressions.</P>
-      <H4>Repeats:</H4>
-      <P>Any atom (a single character, a marked sub-expression, or a character class) 
-         can be repeated with the *, +, ?, and {}&nbsp;operators.</P>
-      <P>The * operator will match the preceding atom zero or more times, for example 
-         the expression a*b will match any of the following:</P>
-      <PRE>b
-ab
-aaaaaaaab</PRE>
-      <P>The + operator will match the preceding atom one or more times, for example the 
-         expression a+b will match any of the following:</P>
-      <PRE>ab
-aaaaaaaab</PRE>
-      <P>But will not match:</P>
-      <PRE>b</PRE>
-      <P>The ? operator will match the preceding atom zero or&nbsp;one times, for 
-         example the expression ca?b will match any of the following:</P>
-      <PRE>cb
-cab</PRE>
-      <P>But will not match:</P>
-      <PRE>caab</PRE>
-      <P>An atom can also be repeated with a bounded repeat:</P>
-      <P>a{n}&nbsp; Matches 'a' repeated exactly <EM>n</EM> times.</P>
-      <P>a{n,}&nbsp; Matches 'a' repeated <EM>n</EM> or more times.</P>
-      <P>a{n, m}&nbsp; Matches 'a' repeated between <EM>n</EM> and <EM>m</EM> times 
-         inclusive.</P>
-      <P>For example:</P>
-      <PRE>^a{2,3}$</PRE>
-      <P>Will match either of:</P>
-      <PRE>aa
-aaa</PRE>
-      <P>But neither of:</P>
-      <PRE>a
-aaaa</PRE>
-      <P>It is an error to use a repeat operator, if the preceding construct can not be 
-         repeated, for example:</P>
-      <PRE>a(*)</PRE>
-      <P>Will raise an error, as there is nothing for the * operator to be applied to.</P>
-      <H4>Non greedy repeats</H4>
-      <P>The normal repeat operators are "greedy", that is to say they will consume as 
-         much input as possible.&nbsp; There are non-greedy versions available that will 
-         consume as little input as possible while still producing a match.</P>
-      <P>*? Matches the previous atom zero or more times, while consuming as little 
-         input as possible.</P>
-      <P>+? Matches the previous atom one or more times, while consuming as little input 
-         as possible.</P>
-      <P>?? Matches the previous atom zero or one times, while consuming as little input 
-         as possible.</P>
-      <P>{n,}? Matches the previous atom <EM>n</EM> or more times, while&nbsp;consuming 
-         as little input as possible.</P>
-      <P>{n,m}? Matches the previous atom between <EM>n</EM> and <EM>m</EM> times, 
-         while&nbsp;consuming as little input as possible.</P>
-      <H4>Back references:</H4>
-      <P>An escape character followed by a digit <EM>n</EM>, where <EM>n </EM>is in the 
-         range 1-9, matches the same string that was matched by sub-expression <EM>n</EM>.&nbsp; 
-         For example the expression:</P>
-      <PRE>^(a*).*\1$</PRE>
-      <P>Will match the string:</P>
-      <PRE>aaabbaaa</PRE>
-      <P>But not the string:</P>
-      <PRE>aaabba</PRE>
-      <H4>Alternation</H4>
-      <P>The | operator will match either of its arguments, so for example: abc|def will 
-         match either "abc" or "def".&nbsp;
-      </P>
-      <P>Parenthesis can be used to group alternations, for example: ab(d|ef) will match 
-         either of "abd" or "abef".</P>
-      <P>Empty&nbsp;alternatives are not allowed (these are almost always a mistake), 
-         but if you really want an empty alternative use (?:) as a placeholder, for 
-         example:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>"|abc" is not a valid expression, but<BR>
-            "(?:)|abc" is and is equivalent, also the expression:<BR>
-            "(?:abc)??" has exactly the same effect.</P>
-      </BLOCKQUOTE>
-      <H4>Character sets:</H4>
-      <P>A character set is a bracket-expression starting with [ and ending with ], it 
-         defines a set of characters, and matches any single character that is a member 
-         of that set.</P>
-      <P>A bracket expression may contain any combination of the following:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Single characters:</H5>
-         <P>For example [abc], will match any of the characters 'a', 'b', or 'c'.</P>
-         <H5>Character ranges:</H5>
-         <P>For example [a-c] will match any single character in the range 'a' to 
-            'c'.&nbsp; By default, for POSIX-Perl regular expressions, a character <EM>x</EM>
-            is within the range <EM>y</EM> to <EM>z</EM>, if it collates within that 
-            range;&nbsp;this results in locale specific behavior.&nbsp; This behavior can 
-            be turned off by unsetting the <EM><A href="syntax_option_type.html#Perl">collate</A></EM>
-            option flag - in which case whether a character appears within a range is 
-            determined by comparing the code points of the characters only</P>
-         <H5>Negation:</H5>
-         <P>If the bracket-expression begins with the ^ character, then it matches the 
-            complement of the characters it contains, for example [^a-c] matches any 
-            character that is not in the range a-c.</P>
-         <H5>Character classes:</H5>
-         <P>An expression of the form [[:name:]] matches the named character class "name", 
-            for example [[:lower:]] matches any lower case character.&nbsp; See <A href="character_class_names.html">
-               character class names</A>.</P>
-         <H5>Collating Elements:</H5>
-         <P>An expression of the form [[.col.] matches the collating element <EM>col</EM>.&nbsp; 
-            A collating element is any single character, or any sequence of characters that 
-            collates as a single unit.&nbsp; Collating elements may also be used as the end 
-            point of a range, for example: [[.ae.]-c] matches the character sequence "ae", 
-            plus any single character in the range "ae"-c, assuming that "ae" is treated as 
-            a single collating element in the current locale.</P>
-         <P>As an extension, a collating element may also be specified via it's <A href="collating_names.html">
-               symbolic name</A>, for example:</P>
-         <P>[[.NUL.]]</P>
-         <P>matches a NUL character.</P>
-         <H5>Equivalence classes:</H5>
-         <P>
-            An expression oftheform[[=col=]], matches any character or collating element 
-            whose primary sort key is the same as that for collating element <EM>col</EM>, 
-            as with colating elements the name <EM>col</EM> may be a <A href="collating_names.html">
-               symbolic name</A>.&nbsp; A primary sort key is one that ignores case, 
-            accentation, or locale-specific tailorings; so for example [[=a=]] matches any 
-            of the characters: a, à, á, â, ã, ä, å, A, À, Á, Â, Ã, Ä and Å.&nbsp; 
-            Unfortunately implementation of this is reliant on the platform's collation and 
-            localisation support; this feature can not be relied upon to work portably 
-            across all platforms, or even all locales on one platform.</P>
-         <H5>Escapes:</H5>
-         <P>All the escape sequences that match a single character, or a single character 
-            class are permitted within a character class definition, <EM>except</EM> the 
-            negated character classes (\D \W etc).</P>
-      </BLOCKQUOTE>
-      <H5>Combinations:</H5>
-      <P>All of the above can be combined in one character set declaration, for example: 
-         [[:digit:]a-c[.NUL.]].</P>
-      <H4>Escapes</H4>
-      <P>Any special character preceded by an escape shall match itself.
-      </P>
-      <P>The following escape sequences are also supported:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Escapes matching a specific character</H5>
-         <P>The following escape sequences are all synonyms for single characters:</P>
-         <P>
-            <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD><STRONG>Escape</STRONG></TD>
-                  <TD><STRONG>Character</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\a</TD>
-                  <TD>'\a'</TD>
-               </TR>
-               <TR>
-                  <TD>\e</TD>
-                  <TD>0x1B</TD>
-               </TR>
-               <TR>
-                  <TD>\f</TD>
-                  <TD>\f</TD>
-               </TR>
-               <TR>
-                  <TD>\n</TD>
-                  <TD>\n</TD>
-               </TR>
-               <TR>
-                  <TD>\r</TD>
-                  <TD>\r</TD>
-               </TR>
-               <TR>
-                  <TD>\t</TD>
-                  <TD>\t</TD>
-               </TR>
-               <TR>
-                  <TD>\v</TD>
-                  <TD>\v</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>\b (but only inside a character class declaration).</TD>
-               </TR>
-               <TR>
-                  <TD>\cX</TD>
-                  <TD>An ASCII escape sequence - the character whose code point is X % 32</TD>
-               </TR>
-               <TR>
-                  <TD>\xdd</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdd.</TD>
-               </TR>
-               <TR>
-                  <TD>\x{dddd}</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\0ddd</TD>
-                  <TD>An octal escape sequence - matches the single character whose code point is 
-                     0ddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\N{name}</TD>
-                  <TD>Matches the single character which has the <A href="collating_names.html">symbolic 
-                        name</A> <EM>name.&nbsp; </EM>For example \N{newline} matches the single 
-                     character \n.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>"Single character" character&nbsp;classes:</H5>
-         <P>Any escaped character <EM>x</EM>, if <EM>x</EM> is the name of a character 
-            class shall match any character that is a member of that class, and any escaped 
-            character <EM>X</EM>, if <EM>x</EM> is the name of a character class, shall 
-            match any character not in that class.</P>
-         <P>The following are supported by default:</P>
-         <P>
-            <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="300" border="1">
-               <TR>
-                  <TD><STRONG>Escape sequence</STRONG></TD>
-                  <TD><STRONG>Equivalent to</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\d</TD>
-                  <TD>[[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\l</TD>
-                  <TD>[[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\s</TD>
-                  <TD>[[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\u</TD>
-                  <TD>[[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\w</TD>
-                  <TD>[[:word:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\D</TD>
-                  <TD>[^[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\L</TD>
-                  <TD>[^[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\S</TD>
-                  <TD>[^[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\U</TD>
-                  <TD>[^[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\W</TD>
-                  <TD>[^[:word:]]</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Character Properties</H5>
-         <P>The character property names in the following table are all equivalent to the <A href="character_class_names.html">
-               names used in character classes</A>.</P>
-         <P>
-            <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="0">
-               <TR>
-                  <TD><STRONG>Form</STRONG></TD>
-                  <TD><STRONG>Description</STRONG></TD>
-                  <TD><STRONG>Equivalent character set form</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\pX</TD>
-                  <TD>Matches any character that has the property X.</TD>
-                  <TD>[[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\p{Name}</TD>
-                  <TD>Matches any character that has the property <EM>Name</EM>.</TD>
-                  <TD>[[:Name:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\PX</TD>
-                  <TD>Matches any character that does not have the property X.</TD>
-                  <TD>[^[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\P{Name}</TD>
-                  <TD>Matches any character that does not have the property <EM>Name</EM>.</TD>
-                  <TD>[^[:Name:]]</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Word Boundaries</H5>
-         <P>The following escape sequences match the boundaries of words:</P>
-         <P>
-            <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\&lt;</TD>
-                  <TD>Matches the start of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\&gt;</TD>
-                  <TD>Matches the end of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>Matches a word boundary (the start or end of a word).</TD>
-               </TR>
-               <TR>
-                  <TD>\B</TD>
-                  <TD>Matches only when not at a word boundary.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Buffer boundaries</H5>
-         <P>The following match only at buffer boundaries: a "buffer" in this context is 
-            the whole of the input text&nbsp;that is being matched against (note that ^ and 
-            $ may match embedded newlines within the text).</P>
-         <P>
-            <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\`</TD>
-                  <TD>Matches at the start of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\'</TD>
-                  <TD>Matches at the end of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\A</TD>
-                  <TD>Matches at the start of a buffer only (the same as \`).</TD>
-               </TR>
-               <TR>
-                  <TD>\z</TD>
-                  <TD>Matches at the end of a buffer only (the same as \').</TD>
-               </TR>
-               <TR>
-                  <TD>\Z</TD>
-                  <TD>Matches an optional sequence of newlines at the end of a buffer: equivalent to 
-                     the regular expression \n*\z</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Continuation Escape</H5>
-         <P>The sequence \G matches only at the end of the last match found, or at the 
-            start of the text being matched if no previous match was found.&nbsp; This 
-            escape useful if you're iterating over the matches contained within a text, and 
-            you want each subsequence match to start where the last one ended.</P>
-         <H5>Quoting escape</H5>
-         <P>The escape sequence \Q begins a "quoted sequence": all the subsequent 
-            characters are treated as literals, until either the end of the regular 
-            expression or \E is found.&nbsp; For example the expression: \Q\*+\Ea+ would 
-            match either of:</P>
-         <PRE>\*+a<BR>\*+aaa</PRE>
-         <H5>Unicode escapes</H5>
-         <P>
-            <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\C</TD>
-                  <TD>Matches a single code point: in Boost regex this has exactly the same effect 
-                     as a "." operator.</TD>
-               </TR>
-               <TR>
-                  <TD>\X</TD>
-                  <TD>Matches a combining character sequence: that is any non-combining character 
-                     followed by a sequence of zero or more combining characters.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Any other escape</H5>
-         <P>Any other escape sequence matches the character that is escaped, for example \@ 
-            matches a literal <A href="mailto:'@'">'@'</A>.</P>
-      </BLOCKQUOTE>
-      <H4 dir="ltr">Perl Extended Patterns</H4>
-      <P dir="ltr">Perl-specific extensions to the regular expression syntax all start 
-         with (?.</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5 dir="ltr">Comments</H5>
-         <P dir="ltr">(?# ... ) is treated as a comment, it's contents are ignored.</P>
-         <H5 dir="ltr">Modifiers</H5>
-         <P dir="ltr">(?imsx-imsx ... ) alters which of the perl modifiers are in effect 
-            within the pattern, changes take effect from the point that the block is first 
-            seen and extend to any enclosing ).&nbsp; Letters before a '-' turn that perl 
-            modifier on, letters afterward, turn it off.</P>
-         <P dir="ltr">(?imsx-imsx:pattern) applies the specified modifiers to <EM>pattern</EM>
-            only.</P>
-         <H5 dir="ltr">Non-marking grouping</H5>
-         <P dir="ltr">(?:pattern) lexically groups <EM>pattern</EM>, without generating an 
-            additional sub-expression.</P>
-         <H5 dir="ltr">Lookahead</H5>
-         <P dir="ltr">(?=pattern) consumes zero characters, only if <EM>pattern</EM> matches.</P>
-         <P dir="ltr">(?!pattern) consumes zero characters, only if <EM>pattern</EM> does 
-            not match.</P>
-         <P dir="ltr">Lookahead is typically used to create the logical AND of two regular 
-            expressions, for example if a password must contain a lower case letter, an 
-            upper case letter, a punctuation symbol, and be at least 6 characters long, 
-            then the expression:</P>
-         <PRE dir="ltr">(?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}</PRE>
-         <P dir="ltr">could be used to validate the password.</P>
-         <H5 dir="ltr">Lookbehind</H5>
-         <P dir="ltr">(?&lt;=pattern) consumes zero characters, only if <EM>pattern</EM> could 
-            be matched against the characters preceding the current position (<EM>pattern</EM>
-            must be of fixed length).</P>
-         <P dir="ltr">(?&lt;!pattern) consumes zero characters, only if <EM>pattern</EM> could 
-            not be matched against the characters preceding the current position (<EM>pattern</EM>
-            must be of fixed length).</P>
-         <H5 dir="ltr">Independent sub-expressions</H5>
-         <P dir="ltr">(?&gt;pattern) <EM>pattern</EM> is matched independently of the 
-            surrounding patterns, the expression will never backtrack into <EM>pattern</EM>.&nbsp; 
-            Independent sub-expressions are typically used to improve performance; only the 
-            best possible match for <EM>pattern</EM> will be considered, if this doesn't 
-            allow the expression as a whole to match then no match is found at all.</P>
-         <H5 dir="ltr">Conditional Expressions</H5>
-         <P dir="ltr">(?(condition)yes-pattern|no-pattern) attempts to match <EM>yes-pattern</EM>
-            if the <EM>condition </EM>is true, otherwise attempts to match <EM>no-pattern</EM>.</P>
-         <P dir="ltr">(?(condition)yes-pattern) attempts to match <EM>yes-pattern</EM> if 
-            the <EM>condition </EM>is true, otherwise fails.</P>
-         <P dir="ltr"><EM>Condition</EM> may be either a forward lookahead assert, or the 
-            index of a marked sub-expression (the condition becomes true if the 
-            sub-expression has been matched).</P>
-      </BLOCKQUOTE><A name="what">
-         <H4>Operator precedence</H4>
-         <P>&nbsp;The order of precedence for of operators is as shown in the following 
-            table:</P>
-         <P>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>Collation-related bracket symbols</TD>
-                  <TD>[==] [::] [..]</TD>
-               </TR>
-               <TR>
-                  <TD>Escaped characters
-                  </TD>
-                  <TD>\</TD>
-               </TR>
-               <TR>
-                  <TD>Character set&nbsp;(bracket expression)
-                  </TD>
-                  <TD>[]</TD>
-               </TR>
-               <TR>
-                  <TD>Grouping</TD>
-                  <TD>()</TD>
-               </TR>
-               <TR>
-                  <TD>Single-character-ERE duplication
-                  </TD>
-                  <TD>* + ? {m,n}</TD>
-               </TR>
-               <TR>
-                  <TD>Concatenation</TD>
-                  <TD></TD>
-               </TR>
-               <TR>
-                  <TD>Anchoring</TD>
-                  <TD>^$</TD>
-               </TR>
-               <TR>
-                  <TD>Alternation</TD>
-                  <TD>|</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </A>
-      <H3>What gets matched</H3>
-      <P>If you view the regular expression as a directed (possibly cyclic) graph, then 
-         the best match found is the first match found by a depth-first-search performed 
-         on that graph, while matching the input text.</P>
-      <P>Alternatively:</P>
-      <P>the best match found is the leftmost match, with individual elements matched as 
-         follows;</P>
-      <P>
-         <TABLE id="Table8" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Construct</STRONG></TD>
-               <TD><STRONG>What gets matches</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>AtomA AtomB</TD>
-               <TD>Locates the best match for AtomA that has a following match for&nbsp;AtomB.</TD>
-            </TR>
-            <TR>
-               <TD>Expression1 | Expression2</TD>
-               <TD>If Expresion1 can be matched then returns that match, otherwise attempts to 
-                  match Expression2.</TD>
-            </TR>
-            <TR>
-               <TD>S{N}</TD>
-               <TD>Matches S repeated exactly N times.</TD>
-            </TR>
-            <TR>
-               <TD>S{N,M}</TD>
-               <TD>Matches S repeated between N and M times, and as many times as possible.</TD>
-            </TR>
-            <TR>
-               <TD>S{N,M}?</TD>
-               <TD>Matches S repeated between N and M times, and as few times as possible.</TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> S?, S*, S+</TD>
-               <TD><!--StartFragment --> The same as <CODE>S{0,1}</CODE>, <CODE>S{0,UINT_MAX}</CODE>,
-                  <CODE>S{1,UINT_MAX}</CODE> respectively.
-               </TD>
-            </TR>
-            <TR>
-               <TD>S??, S*?, S+?</TD>
-               <TD>The same as <CODE>S{0,1}?</CODE>, <CODE>S{0,UINT_MAX}?</CODE>, <CODE>S{1,UINT_MAX}?</CODE>
-                  respectively.
-               </TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> (?&gt;S)
-               </TD>
-               <TD>Matches the best match for S, and only that.</TD>
-            </TR>
-            <TR>
-               <TD>
-                  (?=S), (?&lt;=S)
-               </TD>
-               <TD>Matches only the best match for S (this is only visible if there are capturing 
-                  parenthesis within S).</TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> (?!S), (?&lt;!S)</TD>
-               <TD>Considers only whether a match for S exists or not.</TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> (?(condition)yes-pattern | no-pattern)</TD>
-               <TD>If condition is <EM>true</EM>, then only <EM>yes-pattern</EM> is considered, 
-                  otherwise only <EM>no-pattern</EM> is considered.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="variations"></A>Variations</H3>
-      <P>The options <A href="syntax_option_type.html#perl"><EM>normal, ECMAScript, JavaScript</EM>
-            and <EM>JScript</EM></A> are all synonyms for <EM>Perl</EM>.</P>
-      <H3><A name="options"></A>Options</H3>
-      <P>There are a <A href="syntax_option_type.html#Perl">variety of flags</A> that 
-         may be combined with the <EM>Perl</EM> option when constructing the regular 
-         expression, in particular note that the <A href="syntax_option_type.html#Perl">newline_alt</A>
-         option alters the syntax, while the <A href="syntax_option_type.html#Perl">collate, 
-            nosubs&nbsp;and icase</A> options modify how the case and locale sensitivity 
-         are to be applied.</P>
-      <H3><A name="mods"></A>Modifiers</H3>
-      <P>The perl <EM>smix</EM> modifiers can either be applied using a (?smix-smix) 
-         prefix to the regular expression, or with one of the regex-compile time flags <EM><A href="syntax_option_type.html#Perl">
-               no_mod_m, mod_x, mod_s, and no_mod_s</A></EM>.
-      </P>
-      <H3><A name="refs">References</H3>
-      <P><A href="http://perldoc.perl.org/perlre.html"> Perl 5.8.</A></P>
-      <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21 Aug 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;2004</I></P>
-      <I>
-         <P><I>Use, modification and distribution are subject to the Boost Software License, 
-               Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-               or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>).</I></P>
-      </I>
-   </body>
-</html>
diff --git a/doc/Attic/thread_safety.html b/doc/Attic/thread_safety.html
deleted file mode 100644
index 894a7688..00000000
--- a/doc/Attic/thread_safety.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Thread Safety</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Thread Safety</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <P>The regex library is thread safe when Boost is: you can verify that Boost is in 
-         thread safe mode by checking to see if BOOST_HAS_THREADS is defined: this macro 
-         is set automatically by the config system when threading support is turned on 
-         in your compiler.
-      </P>
-      <P>Class <A href="basic_regex.html">basic_regex</A>&lt;&gt; and its typedefs regex 
-         and wregex are thread safe, in that compiled regular expressions can safely be 
-         shared between threads. The matching algorithms <A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, <A href="regex_grep.html">regex_grep</A>,
-         <A href="regex_format.html">regex_format</A> and <A href="regex_merge.html">regex_merge</A>
-         are all re-entrant and thread safe. Class <A href="match_results.html">match_results</A>
-         is now thread safe, in that the results of a match can be safely copied from 
-         one thread to another (for example one thread may find matches and push 
-         match_results instances onto a queue, while another thread pops them off the 
-         other end), otherwise use a separate instance of <A href="match_results.html">match_results</A>
-         per thread.
-      </P>
-      <P>The <A href="posix_api.html">POSIX API functions</A> are all re-entrant and 
-         thread safe, regular expressions compiled with <I>regcomp</I> can also be 
-         shared between threads.
-      </P>
-      <P>The class<A href="regex.html"> RegEx</A> is only thread safe if each thread 
-         gets its own RegEx instance (apartment threading) - this is a consequence of 
-         RegEx handling both compiling and matching regular expressions.
-      </P>
-      <P>Finally note that changing the global locale invalidates all compiled regular 
-         expressions, therefore calling <I>set_locale</I> from one thread while another 
-         uses regular expressions <I>will</I> produce unpredictable results.
-      </P>
-      <P>
-         There is also a requirement that there is only one thread executing prior to 
-         the start of main().</P>
-      <HR>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/Attic/uarrow.gif b/doc/Attic/uarrow.gif
deleted file mode 100644
index 6afd20c3..00000000
Binary files a/doc/Attic/uarrow.gif and /dev/null differ
diff --git a/doc/Attic/unicode.html b/doc/Attic/unicode.html
deleted file mode 100644
index 9e22faf3..00000000
--- a/doc/Attic/unicode.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Index</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Unicode Regular Expressions.</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>There are two ways to use Boost.Regex with Unicode strings:</P>
-      <H3>Rely on wchar_t</H3>
-      <P>If your platform's wchar_t type can hold Unicode strings, <EM>and</EM> your 
-         platform's C/C++ runtime correctly handles wide character constants (when 
-         passed to std::iswspace std::iswlower etc), then you can use boost::wregex to 
-         process Unicode.&nbsp; However, there are several disadvantages to this 
-         approach:</P>
-      <UL>
-         <LI>
-            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.</LI>
-         <LI>
-            There's no support for Unicode-specific character classes: [[:Nd:]], [[:Po:]] 
-            etc.</LI>
-         <LI>
-            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.</LI></UL>
-      <H3>Use a Unicode Aware Regular Expression Type.</H3>
-      <P>If you have the <A href="http://www.ibm.com/software/globalization/icu/">ICU 
-            library</A>, then Boost.Regex can be <A href="install.html#unicode">configured 
-            to make use of it</A>, and provide a distinct regular expression type 
-         (boost::u32regex), that supports both Unicode specific character properties, 
-         and the searching of text that is encoded in either UTF-8, UTF-16, or 
-         UTF-32.&nbsp; See: <A href="icu_strings.html">ICU string class support</A>.</P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2005</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
new file mode 100644
index 00000000..38357c9e
--- /dev/null
+++ b/doc/Jamfile.v2
@@ -0,0 +1,57 @@
+
+# Copyright John Maddock 2005. Use, modification, and distribution are
+# subject to 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)
+
+using quickbook ;
+
+path-constant boost-images : ../../../doc/src/images ;
+
+xml regex : regex.qbk ;
+boostbook standalone
+    :
+        regex
+    :
+        # HTML options first:
+        # Use graphics not text for navigation:
+        <xsl:param>navig.graphics=1
+        # How far down we chunk nested sections, basically all of them:
+        <xsl:param>chunk.section.depth=10
+        # Don't put the first section on the same page as the TOC:
+        <xsl:param>chunk.first.sections=1
+        # How far down sections get TOC's
+        <xsl:param>toc.section.depth=10
+        # Max depth in each TOC:
+        <xsl:param>toc.max.depth=4
+        # How far down we go with TOC's
+        <xsl:param>generate.section.toc.level=10
+        # Path for links to Boost:
+        <xsl:param>boost.root=../../../..
+        # Path for libraries index:
+        <xsl:param>boost.libraries=../../../../libs/libraries.htm
+        # Use the main Boost stylesheet:
+        <xsl:param>html.stylesheet=../../../../doc/html/boostbook.css
+        
+        # PDF Options:
+        # TOC Generation: this is needed for FOP-0.9 and later:
+        #<xsl:param>fop1.extensions=1
+        # Or enable this if you're using XEP:
+        <xsl:param>xep.extensions=1
+        # TOC generation: this is needed for FOP 0.2, but must not be set to zero for FOP-0.9!
+        <xsl:param>fop.extensions=0
+        # No indent on body text:
+        <xsl:param>body.start.indent=0pt
+        # Margin size:
+        <xsl:param>page.margin.inner=0.5in
+        # Margin size:
+        <xsl:param>page.margin.outer=0.5in
+        # Yes, we want graphics for admonishments:
+        <xsl:param>admon.graphics=1
+        # Set this one for PDF generation *only*:
+        # default pnd graphics are awful in PDF form,
+        # better use SVG's instead:
+        <format>pdf:<xsl:param>admon.graphics.extension=".svg"
+        <format>pdf:<xsl:param>admon.graphics.path=$(boost-images)/
+    ;
+
+
diff --git a/doc/acknowledgements.qbk b/doc/acknowledgements.qbk
new file mode 100644
index 00000000..d35a7962
--- /dev/null
+++ b/doc/acknowledgements.qbk
@@ -0,0 +1,49 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:acknowledgements Acknowledgements]
+
+The author can be contacted at john - at - johnmaddock.co.uk; the home page for this 
+library is at [@http://www.boost.org www.boost.org].
+
+I am indebted to [@http://www.cs.princeton.edu/~rs/ 
+Robert Sedgewick's "Algorithms in C++"] for forcing me to think 
+about algorithms and their performance, and to the folks at boost for forcing me 
+to think, period.
+
+[@http://www.boost-consulting.com/ Eric Niebler], author of Boost.Expressive and 
+the [@http://research.microsoft.com/projects/greta GRETA regular expression component], 
+has shared several important ideas, in a series of long discussions.
+
+Pete Becker, of [@http://www.versatilecoding.com Roundhouse Consulting, Ltd.], 
+has helped enormously with the standardisation 
+proposal language.
+
+The following people have all contributed useful comments or fixes: Dave Abrahams, 
+Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan B'''&#xF6;'''lsche, Beman Dawes, 
+Paul Baxter, David Bergman, David Dennerline, Edward Diener, Peter Dimov, 
+Robert Dunn, Fabio Forno, Tobias Gabrielsson, Rob Gillen, Marc Gregoire, Chris Hecker, 
+Nick Hodapp, Jesse Jones, Martin Jost, Boris Krasnovskiy, Jan Hermelink, Max Leung, 
+Wei-hao Lin, Jens Maurer, Richard Peters, Heiko Schmidt, Jason Shirk, Gerald Slacik, 
+Scobie Smith, Mike Smyth, Alexander Sokolovsky, Herv'''&#xE9;''' Poirier, Michael Raykh, 
+Marc Recht, Scott VanCamp, Bruno Voigt, Alexey Voinov, Jerry Waldorf, Rob Ward, 
+Lealon Watts, John Wismar, Thomas Witt and Yuval Yosef. 
+
+If I've missed your name off (I'm sure there are a few, just not who they are...) then 
+please do get in touch.
+
+I am also grateful to the manuals supplied with the Henry Spencer, PCRE, Perl 
+and GNU regular expression libraries - wherever possible I have tried to 
+maintain compatibility with these libraries and with the POSIX standard - 
+the code however is entirely my own, including any bugs! I can absolutely guarantee 
+that I will not fix any bugs I don't know about, so if you have any comments or 
+spot any bugs, please get in touch.
+
+[endsect]
+
+
diff --git a/doc/bad_expression.html b/doc/bad_expression.html
deleted file mode 100644
index aee75368..00000000
--- a/doc/bad_expression.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: regex_error</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class regex_error</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Synopsis</h3>
-      <p>#include &lt;<a href="../../../boost/regex/pattern_except.hpp">boost/pattern_except.hpp</a>&gt;</p>
-      <p>The class <code>regex_error</code> defines the type of objects thrown as 
-         exceptions to report errors during the conversion from a string representing a 
-         regular expression to a finite state machine.&nbsp;&nbsp;</p>
-      <pre>
-<b>namespace</b> boost{
-
-<b>class</b> regex_error : <b>public</b> std::runtime_error
-{
-<b>public</b>:
-   <b>explicit</b> regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type err</a>, std::ptrdiff_t pos);
-   <b>explicit</b> regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);
-   <a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;
-   std::ptrdiff_t position()<b>const</b>;
-};
-
-typedef regex_error bad_pattern; // for backwards compatibility
-typedef regex_error bad_expression; // for backwards compatibility
-
-} // namespace boost
-</pre>
-      <h3>Description</h3>
-      <pre>
-regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type</a> err, std::ptrdiff_t pos);
-regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>regex_error</code>.</p>
-      <pre>
-<a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;</pre>
-      <p><b>Effects:</b> returns the error code that represents parsing error that occurred.</p>
-      <pre>
-std::ptrdiff_t position()<b>const</b>; </pre>
-      <p><b>Effects:</b> returns the location in the expression where parsing stopped.</p>
-      <P>Footnotes: the choice of <code>std::runtime_error</code> as the base class for <code>
-            regex_error</code> is moot; depending upon how the library is used 
-         exceptions may be either logic errors (programmer supplied expressions) or run 
-         time errors (user supplied expressions).&nbsp; The library previously used <code>bad_pattern</code>
-         and <code>bad_expression</code> for errors, these have been replaced by the 
-         single class <code>regex_error</code> to keep the library in synchronization 
-         with the standardization proposal.</P>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/bad_expression.qbk b/doc/bad_expression.qbk
new file mode 100644
index 00000000..267bc365
--- /dev/null
+++ b/doc/bad_expression.qbk
@@ -0,0 +1,58 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:bad_expression bad_expression]
+
+[h4 Synopsis]
+
+   #include <boost/pattern_except.hpp>
+
+The class `regex_error` defines the type of objects thrown as exceptions to 
+report errors during the conversion from a string representing a regular 
+expression to a finite state machine.  
+
+   namespace boost{
+
+   class regex_error : public std::runtime_error
+   {
+   public:
+      explicit regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos);
+      explicit regex_error(boost::regex_constants::error_type err);
+      boost::regex_constants::error_type code()const;
+      std::ptrdiff_t position()const;
+   };
+
+   typedef regex_error bad_pattern; // for backwards compatibility
+   typedef regex_error bad_expression; // for backwards compatibility
+   
+   } // namespace boost
+
+[h4 Description]
+
+   regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos);
+   regex_error(boost::regex_constants::error_type err);
+
+[*Effects:] Constructs an object of class regex_error.
+
+   boost::regex_constants::error_type code()const;
+
+[*Effects:] returns the error code that represents parsing error that occurred.
+
+   std::ptrdiff_t position()const; 
+
+[*Effects:] returns the location in the expression where parsing stopped.
+
+Footnotes: the choice of `std::runtime_error` as the base class for `regex_error` 
+is moot; depending upon how the library is used exceptions may be either 
+logic errors (programmer supplied expressions) or run time errors 
+(user supplied expressions).  The library previously used `bad_pattern` 
+and `bad_expression` for errors, these have been replaced by the single 
+class `regex_error` to keep the library in synchronization with the 
+[tr1].
+
+[endsect]
diff --git a/doc/basic_regex.html b/doc/basic_regex.html
deleted file mode 100644
index 16774739..00000000
--- a/doc/basic_regex.html
+++ /dev/null
@@ -1,906 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: basic_regex</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">basic_regex</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Synopsis</h3>
-      <pre>
-#include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
-</pre>
-      <p>The template class <em>basic_regex</em> encapsulates regular expression parsing 
-         and compilation. The class takes two template parameters:</p>
-      <p><b><i>charT</i></b>: determines the character type, i.e. either char or 
-         wchar_t; see <EM><A href="concepts.html#charT">charT concept</A></EM>.</p>
-      <p><b><i>traits</i></b>: determines the behavior of the character type, for 
-         example which character class names are recognized. A default traits class is 
-         provided: <a href="regex_traits.html">regex_traits&lt;charT&gt;</a>.&nbsp; See 
-         also <EM><A href="concepts.html#traits">traits concept</A></EM>.</p>
-      <p>For ease of use there are two typedefs that define the two standard <i>basic_regex</i>
-         instances, unless you want to use custom traits classes or non-standard 
-         character types, you won't need to use anything other than these:</p>
-      <pre>
-<b>namespace</b> boost{
-<b>template</b> &lt;<b>class</b> charT, <b>class</b> traits = regex_traits&lt;charT&gt;  &gt;
-<b>class</b> basic_regex;
-<b>typedef</b> basic_regex&lt;<b>char</b>&gt;      regex;
-<b>typedef</b> basic_regex&lt;<b>wchar_t&gt;</b>   wregex;
-}
-</pre>
-      <p>The definition of <i>basic_regex</i> follows: it is based very closely on class 
-         basic_string, and fulfils the requirements for a constant-container of <i>charT</i>.</p>
-      <pre>
-namespace boost{
-
-template &lt;class  charT, class traits = regex_traits&lt;charT&gt; &gt;
-class basic_regex {
-   public:          
-   // types:
-   typedef          charT                                value_type;
-   typedef          implementation-specific              const_iterator;
-   typedef          const_iterator                       iterator;                 
-   typedef          charT&amp;                               reference;           
-   typedef          const charT&amp;                         const_reference;           
-   typedef          std::ptrdiff_t                       difference_type;                 
-   typedef          std::size_t                          size_type;
-   typedef          regex_constants::syntax_option_type  flag_type;
-   typedef typename traits::locale_type                  locale_type;
-
-   // constants:
-   // main option selection:
-   static const regex_constants::syntax_option_type normal          = regex_constants::normal;
-   static const regex_constants::syntax_option_type ECMAScript      = normal;
-   static const regex_constants::syntax_option_type JavaScript      = normal;
-   static const regex_constants::syntax_option_type JScript         = normal;
-   static const regex_constants::syntax_option_type basic           = regex_constants::basic;
-   static const regex_constants::syntax_option_type extended        = regex_constants::extended;
-   static const regex_constants::syntax_option_type awk             = regex_constants::awk;
-   static const regex_constants::syntax_option_type grep            = regex_constants::grep;
-   static const regex_constants::syntax_option_type egrep           = regex_constants::egrep;
-   static const regex_constants::syntax_option_type sed             = basic = regex_constants::sed;
-   static const regex_constants::syntax_option_type perl            = regex_constants::perl;
-   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        = regex_constants::no_mod_m;
-   static const regex_constants::syntax_option_type no_mod_s        = regex_constants::no_mod_s;
-   static const regex_constants::syntax_option_type mod_s           = regex_constants::mod_s;
-   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      = regex_constants::bk_plus_qm;
-   static const regex_constants::syntax_option_type bk_vbar         = regex_constants::bk_vbar
-   static const regex_constants::syntax_option_type no_char_classes = regex_constants::no_char_classes
-   static const regex_constants::syntax_option_type no_intervals    = regex_constants::no_intervals
-   // common modifiers:
-   static const regex_constants::syntax_option_type nosubs          = regex_constants::nosubs;
-   static const regex_constants::syntax_option_type optimize        = regex_constants::optimize;
-   static const regex_constants::syntax_option_type collate         = regex_constants::collate;
-   static const regex_constants::syntax_option_type newline_alt     = regex_constants::newline_alt;
-   static const regex_constants::syntax_option_type no_except       = regex_constants::newline_alt;
-
-   // construct/copy/destroy:
-   explicit <A href="#c1">basic_regex</A> ();
-   explicit <A href="#c2">basic_regex</A>(const  charT* p, flag_type f = regex_constants::normal);
-   <A href="#c3">basic_regex</A>(const charT* p1, const  charT* p2, flag_type f = regex_constants::normal);
-   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type  f);
-   <A href="#c5">basic_regex</A>(const basic_regex&amp;);
-   template &lt;class ST, class SA&gt;
-   explicit <A href="#c6">basic_regex</A>(const basic_string&lt;charT, ST,  SA&gt;&amp; p, flag_type f = regex_constants::normal);
-   template &lt;class InputIterator&gt;
-   <A href="#c7">basic_regex</A>(InputIterator first,  InputIterator last, flag_type f = regex_constants::normal);
-
-   ~basic_regex();
-   basic_regex&amp; <A href="#o1">operator</A>=(const basic_regex&amp;);
-   basic_regex&amp; <A href="#o2">operator</A>= (const charT* ptr); 
-   template &lt;class ST, class SA&gt; 
-   basic_regex&amp; <A href="#o3">operator</A>= (const basic_string&lt;charT, ST, SA&gt;&amp; p);
-   // iterators: 
-   const_iterator <A href="#m1">begin</A>() const; 
-   const_iterator <A href="#m2">end</A>() const;
-   // capacity: 
-   size_type <A href="#m3">size</A>() const; 
-   size_type <A href="#m4">max_size</A>() const; 
-   bool <A href="#m5">empty</A>() const; 
-   unsigned <A href="#m6">mark_count</A>()const; 
-   //
-   // modifiers: 
-   basic_regex&amp; <A href="#a1">assign</A>(const basic_regex&amp; that); 
-   basic_regex&amp; <A href="#a2">assign</A>(const charT* ptr, flag_type f = regex_constants::normal);
-   basic_regex&amp; <A href="#a3">assign</A>(const charT* ptr, unsigned int len, flag_type f);
-   template &lt;class string_traits, class A&gt;
-   basic_regex&amp; <A href="#a4">assign</A>(const basic_string&lt;charT, string_traits, A&gt;&amp; s,
-                       flag_type f = regex_constants::normal);
-   template &lt;class InputIterator&gt;
-   basic_regex&amp; <A href="#a5">assign</A>(InputIterator first, InputIterator last,
-                       flag_type f = regex_constants::normal);
-
-   // const operations:
-   flag_type <A href="#m8">flags</A>() const;
-   int <A href="#m8b">status</A>()const;
-   basic_string&lt;charT&gt; <A href="#m9">str</A>() const;
-   int <A href="#m10">compare</A>(basic_regex&amp;) const;
-   // locale:
-   locale_type <A href="#m11">imbue</A>(locale_type loc);
-   locale_type <A href="#m12">getloc</A>() const;
-   // swap
-   void <A href="#m13">swap</A>(basic_regex&amp;) throw();
-};
-
-template &lt;class charT, class traits&gt;
-bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-template &lt;class charT, class traits&gt;
-bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-
-template &lt;class charT, class io_traits, class re_traits&gt;
-basic_ostream&lt;charT, io_traits&gt;&amp;
-   <A href="#o11">operator</A> &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os,
-                const basic_regex&lt;charT, re_traits&gt;&amp; e);
-
-template &lt;class charT, class traits&gt;
-void <A href="#o12">swap</A>(basic_regex&lt;charT, traits&gt;&amp; e1,
-          basic_regex&lt;charT, traits&gt;&amp; e2);
-
-typedef basic_regex&lt;char&gt; regex;
-typedef basic_regex&lt;wchar_t&gt; wregex;
-
-} // namespace boost
-</pre>
-      <h3>Description</h3>
-      <p>Class&nbsp;<em>basic_regex</em> has the following public member functions:</p>
-      <h4>basic_regex constants</h4>
-      <pre>
-// main option selection:
-static const regex_constants::syntax_option_type normal           = regex_constants::normal;
-static const regex_constants::syntax_option_type ECMAScript       = normal;
-static const regex_constants::syntax_option_type JavaScript       = normal;
-static const regex_constants::syntax_option_type JScript          = normal;
-static const regex_constants::syntax_option_type basic            = regex_constants::basic;
-static const regex_constants::syntax_option_type extended         = regex_constants::extended;
-static const regex_constants::syntax_option_type awk              = regex_constants::awk;
-static const regex_constants::syntax_option_type grep             = regex_constants::grep;
-static const regex_constants::syntax_option_type egrep            = regex_constants::egrep;
-static const regex_constants::syntax_option_type sed              = regex_constants::sed;
-static const regex_constants::syntax_option_type perl             = regex_constants::perl;
-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         = regex_constants::no_mod_m;
-static const regex_constants::syntax_option_type no_mod_s         = regex_constants::no_mod_s;
-static const regex_constants::syntax_option_type mod_s            = regex_constants::mod_s;
-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       = regex_constants::bk_plus_qm;
-static const regex_constants::syntax_option_type bk_vbar          = regex_constants::bk_vbar
-static const regex_constants::syntax_option_type no_char_classes  = regex_constants::no_char_classes
-static const regex_constants::syntax_option_type no_intervals     = regex_constants::no_intervals
-// common modifiers:
-static const regex_constants::syntax_option_type nosubs           = regex_constants::nosubs;
-static const regex_constants::syntax_option_type optimize         = regex_constants::optimize;
-static const regex_constants::syntax_option_type collate          = regex_constants::collate;
-static const regex_constants::syntax_option_type newline_alt      = regex_constants::newline_alt;
-</pre>
-      <p>The static constant members are provided as synonyms for the constants declared 
-         in namespace <code>boost::regex_constants</code>; for each constant of type <code><A href="syntax_option_type.html">
-               syntax_option_type</A></code> declared in namespace <code>boost::regex_constants</code>
-         then a constant with the same name, type and value is declared within the scope 
-         of <code>basic_regex</code>.</p>
-      <h4>basic_regex constructors</h4>
-      <pre><A name=c1> basic_regex();
-</pre>
-      <P><b>Effects:</b> Constructs an object of class <code>basic_regex</code>. The 
-         postconditions of this function are indicated in the table:</P>
-      <div align="center">
-         <center>
-            <table id="Table2" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>true</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>0</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;()</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><A name=c2><BR> basic_regex(const charT* p, flag_type f = regex_constants::normal);
- 
-</pre>
-      <P><b>Requires:</b> <i>p</i> shall not be a null pointer.</P>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>p</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the null-terminated string <i>p</i>, and interpreted 
-         according to the <a href="syntax_option_type.html">option flags</a>&nbsp;specified 
-         in <i>f</i>. The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table3" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>char_traits&lt;charT&gt;::length(p)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(p)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre>
- 
-</pre>
-      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal);</PRE>
-      <p><b>Requires:</b> <i>p1</i> and <i>p2</i> are not null pointers, <code>p1 &lt; p2</code>.</p>
-      <p><b>Throws:</b> <code>bad_expression</code> if [p1,p2) is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the sequence of characters [p1,p2), and interpreted 
-         according the <a href="syntax_option_type.html">option flags</a> specified in <i>f</i>. 
-         The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table4" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>std::distance(p1,p2)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(p1,p2)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre>
- 
-</pre>
-      <pre><A name=c4></A>basic_regex(const charT* p, size_type len, flag_type f);
-</pre>
-      <p><b>Requires:</b> <i>p</i> shall not be a null pointer, <code>len &lt; max_size()</code>.</p>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>p</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the sequence of characters [p, p+len), and interpreted 
-         according the <a href="syntax_option_type.html">option flags</a> specified in <i>f</i>. 
-         The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table5" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>len</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(p, len)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><A name=c5></A><BR>basic_regex(const basic_regex&amp; e);
-</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code> as a 
-         copy of the object <i>e</i>. The postconditions of this function are indicated 
-         in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table6" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.empty()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.size()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.str()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.flags()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>e.mark_count()</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><BR>
-template &lt;class ST, class SA&gt;
-<A name=c6></A>basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s, flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>s</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the string <i>s</i>, and interpreted according to the <a href="syntax_option_type.html">
-            option flags</a> specified in <i>f</i>. The postconditions of this function 
-         are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table7" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s.size()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><BR>
-template &lt;class ForwardIterator&gt;
-<A name=c7></A>basic_regex(ForwardIterator first, ForwardIterator last, flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Throws:</b> <code>bad_expression</code> if the sequence <i>[first, last)</i> 
-         is not a valid regular expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code>; the 
-         object's internal finite state machine is constructed from the regular 
-         expression contained in the sequence of characters [first, last), and 
-         interpreted according to the <a href="syntax_option_type.html">option flags</a> 
-         specified in <i>f</i>. The postconditions of this function are indicated in the 
-         table:</p>
-      <div align="center">
-         <center>
-            <table id="Table8" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>distance(first,last)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>basic_string&lt;charT&gt;(first,last)</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre><A name=o1></A>
-basic_regex&amp; operator=(const basic_regex&amp; e);
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>assign(e.str(), e.flags())</code>.</p>
-      <pre><A name=o2></A>basic_regex&amp; operator=(const charT* ptr);
-</pre>
-      <p><b>Requires:</b> <i>p</i> shall not be a null pointer.</p>
-      <p><b>Effects:</b> Returns the result of <code>assign(ptr)</code>.</p>
-      <pre><A name=o3></A>
-template &lt;class ST, class SA&gt;
-basic_regex&amp; operator=(const basic_string&lt;charT, ST, SA&gt;&amp; p);
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>assign(p)</code>.</p>
-      <h4>basic_regex iterators</h4>
-      <pre><A name=m1>
-const_iterator begin() const;
-</pre>
-      <p><b>Effects:</b> Returns a starting iterator to a sequence of characters 
-         representing the regular expression.</p>
-      <pre><A name=m2>
-const_iterator end() const;
-</pre>
-      <p><b>Effects:</b> Returns termination iterator to a sequence of characters 
-         representing the regular expression.</p>
-      <h4>basic_regex capacity</h4>
-      <pre><A name=m3>
-size_type size() const;
-</pre>
-      <p><b>Effects:</b> Returns the length of the sequence of characters representing 
-         the regular expression.</p>
-      <pre><A name=m4>
-size_type max_size() const;
-</pre>
-      <p><b>Effects:</b> Returns the maximum length of the sequence of characters 
-         representing the regular expression.</p>
-      <pre><A name=m5></A>
-bool empty() const;
-</pre>
-      <p><b>Effects:</b> Returns <b>true</b> if the object does not contain a valid 
-         regular expression, otherwise <b>false</b>.</p>
-      <pre><A name=m6></A>unsigned mark_count() const;
-</pre>
-      <p><b>Effects:</b> Returns the number of marked sub-expressions within the regular 
-         expresion.</p>
-      <h4>basic_regex assign</h4>
-      <pre><A name=a1>
-basic_regex&amp; assign(const basic_regex&amp; that);
-</pre>
-      <p><b>Effects:</b> Returns <code>assign(that.str(), that.flags())</code>.</p>
-      <pre><A name=a2></A>
-basic_regex&amp; assign(const charT* ptr, flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Effects:</b> Returns <code>assign(string_type(ptr), f)</code>.</p>
-      <PRE><A name=a3></A><A name=a3></A>basic_regex&amp; assign(const charT* ptr, unsigned int len, flag_type f);</PRE>
-      <P><B>Effects:</B> Returns <CODE>assign(string_type(ptr, len), f)</CODE>.</P>
-      <PRE><A name=a4></A>template &lt;class string_traits, class A&gt;
-<A name=a6></A>basic_regex&amp; assign(const basic_string&lt;charT, string_traits, A&gt;&amp; s,
-                    flag_type f = regex_constants::normal);
-</PRE>
-      <p><b>Throws:</b> <code>bad_expression</code> if <i>s</i> is not a valid regular 
-         expression, unless the flag no_except is set in <EM>f</EM>.</p>
-      <p><b>Returns:</b> <code>*this</code>.</p>
-      <p><b>Effects:</b> Assigns the regular expression contained in the string <i>s</i>, 
-         interpreted according the <a href="syntax_option_type.html">option flags</a> specified 
-         in <i>f</i>. The postconditions of this function are indicated in the table:</p>
-      <div align="center">
-         <center>
-            <table id="Table9" cellspacing="1" cellpadding="7" width="624" border="1">
-               <tbody>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p><b>Element</b></p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p><b>Value</b></p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>empty()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>false</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>size()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s.size()</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>str()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>s</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>flags()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>f</p>
-                     </td>
-                  </tr>
-                  <tr>
-                     <td valign="top" width="50%">
-                        <p>mark_count()</p>
-                     </td>
-                     <td valign="top" width="50%">
-                        <p>The number of marked sub-expressions within the expression.</p>
-                     </td>
-                  </tr>
-               </tbody>
-            </table>
-         </center>
-      </div>
-      <pre>
- 
-</pre>
-      <pre><A name=a5></A>template &lt;class InputIterator&gt;
-basic_regex&amp; assign(InputIterator first, InputIterator last,
-                    flag_type f = regex_constants::normal);
-</pre>
-      <p><b>Requires:</b> The type InputIterator corresponds to the Input Iterator 
-         requirements (24.1.1).</p>
-      <p><b>Effects:</b> Returns <code>assign(string_type(first, last), f)</code>.</p>
-      <h4>basic_regex constant operations</h4>
-      <pre><A name=m7></A><A name=m8></A>flag_type flags() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the regular expression syntax flags that were 
-         passed to the object's constructor, or the last call to <code>assign.</code></p>
-      <CODE>
-         <PRE><A name=m7></A><A name=m8></A><A name=m8b></A>int status() const;</PRE>
-      </CODE>
-      <P><STRONG>Effects</STRONG>: Returns zero if the expression contains a valid 
-         regular expression, otherwise an <A href="error_type.html">error code</A>.&nbsp; 
-         This member function is retained for use in environments that cannot use 
-         exception handling.</P>
-      <pre><A name=m9></A>basic_string&lt;charT&gt; str() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the character sequence passed to the object's 
-         constructor, or the last call to <code>assign.</code></p>
-      <pre><A name=m10></A>int compare(basic_regex&amp; e)const;
-</pre>
-      <p><b>Effects:</b> If <code>flags() == e.flags()</code> then returns <code>str().compare(e.str())</code>, 
-         otherwise returns <code>flags() - e.flags()</code>.</p>
-      <h4>basic_regex locale</h4>
-      <pre><A name=m11></A>locale_type imbue(locale_type l);
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>traits_inst.imbue(l)</code> where <code>
-            traits_inst</code> is a (default initialized) instance of the template 
-         parameter <code>traits</code> stored within the object. Calls to imbue 
-         invalidate any currently contained regular expression.</p>
-      <p><b>Postcondition:</b> <code>empty() == true</code>.</p>
-      <pre><A name=m12></A>
-locale_type getloc() const;
-</pre>
-      <p><b>Effects:</b> Returns the result of <code>traits_inst.getloc()</code> where <code>
-            traits_inst</code> is a (default initialized) instance of the template 
-         parameter <code>traits</code> stored within the object.</p>
-      <h4>basic_regex swap</h4>
-      <pre><A name=m13>
-void swap(basic_regex&amp; e) throw();
-</pre>
-      <p><b>Effects:</b> Swaps the contents of the two regular expressions.</p>
-      <p><b>Postcondition:</b> <code>*this</code> contains the characters that were in <i>e</i>,
-         <i>e</i> contains the regular expression that was in <code>*this</code>.</p>
-      <p><b>Complexity:</b> constant time.</p>
-      <h4>basic_regex non-member functions</h4>
-      <h5>basic_regex non-member comparison operators&nbsp;</h5>
-      <P>Comparisons between basic_regex objects are provided on an experimental basis: 
-         please note that these are likely to be removed from the standard library 
-         proposal, so use with care if you are writing portable code.</P>
-      <pre><A name=o4></A>
-template &lt;class charT, class traits&gt;
-bool operator == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) == 0</code>.</p>
-      <pre><A name=o5></A>
-template &lt;class charT, class traits&gt;
-bool operator != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) != 0</code>.</p>
-      <pre><A name=o7></A>
-template &lt;class charT, class traits&gt;
-bool operator &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt; 0</code>.</p>
-      <pre><A name=o8></A>
-template &lt;class charT, class traits&gt;
-bool operator &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt;= 0</code>.</p>
-      <pre><A name=o9></A>
-template &lt;class charT, class traits&gt;
-bool operator &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt;= 0</code>.</p>
-      <pre><A name=o10></A>
-template &lt;class charT, class traits&gt;
-bool operator &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt; 0</code>.</p>
-      <h5>basic_regex inserter.</h5>
-      <P>The basic_regex stream inserter is provided on an experimental basis, and 
-         outputs the textual representation of the expression to the stream:</P>
-      <pre><A name=o11></A>
-template &lt;class charT, class io_traits, class re_traits&gt;
-basic_ostream&lt;charT, io_traits&gt;&amp;
-   operator &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os
-                const basic_regex&lt;charT, re_traits&gt;&amp; e);
-</pre>
-      <p><b>Effects:</b> Returns (os &lt;&lt; e.str()).</p>
-      <h5>basic_regex non-member swap</h5>
-      <pre><A name=o12></A>
-template &lt;class charT, class traits&gt;
-void swap(basic_regex&lt;charT, traits&gt;&amp; lhs,
-          basic_regex&lt;charT, traits&gt;&amp; rhs);
-</pre>
-      <p><b>Effects:</b> calls <code>lhs.swap(rhs)</code>.</p>
-      <hr>
-      <p>Revised 7 Aug 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/basic_regex.qbk b/doc/basic_regex.qbk
new file mode 100644
index 00000000..2aa1aae4
--- /dev/null
+++ b/doc/basic_regex.qbk
@@ -0,0 +1,667 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:basic_regex basic_regex]
+
+[h4 Synopsis]
+
+   #include <boost/regex.hpp>
+
+The template class `basic_regex` encapsulates regular expression 
+parsing and compilation. The class takes two template parameters:
+
+* `charT`: determines the character type, i.e. either `char` or `wchar_t`; 
+see [link boost_regex.ref.concepts.charT_concept charT concept].
+* `traits`: determines the behavior of the character type, for example which 
+character class names are recognized. A default traits class is provided: 
+`regex_traits<charT>`.  See also 
+[link boost_regex.ref.concepts.traits_concept traits concept].
+
+For ease of use there are two typedefs that define the two standard 
+`basic_regex` instances, unless you want to use custom traits classes or 
+non-standard character types (for example see 
+[link boost_regex.ref.non_std_strings.icu unicode support]), 
+you won't need to use anything other than these:
+
+   namespace boost{
+
+   template <class charT, class traits = regex_traits<charT>  >
+   class basic_regex;
+   
+   typedef basic_regex<char>      regex;
+   typedef basic_regex<wchar_t>   wregex;
+
+   }
+
+The definition of `basic_regex` follows: it is based very closely on class 
+`basic_string`, and fulfils the requirements for a constant-container of `charT`.
+
+   namespace boost{
+
+   template <class  charT, class traits = regex_traits<charT> >
+   class basic_regex {
+      public:          
+      // types:
+      typedef          charT                                value_type;
+      typedef          implementation-specific              const_iterator;
+      typedef          const_iterator                       iterator;                 
+      typedef          charT&                               reference;           
+      typedef          const charT&                         const_reference;           
+      typedef          std::ptrdiff_t                       difference_type;                 
+      typedef          std::size_t                          size_type;
+      typedef          regex_constants::``[syntax_option_type]``  flag_type;
+      typedef typename traits::locale_type                  locale_type;
+
+      // constants:
+      // main option selection:
+      static const regex_constants::``[syntax_option_type]`` normal          
+                                                   = regex_constants::normal;
+      static const regex_constants::``[syntax_option_type]`` ECMAScript      
+                                                   = normal;
+      static const regex_constants::``[syntax_option_type]`` JavaScript      
+                                                   = normal;
+      static const regex_constants::``[syntax_option_type]`` JScript         
+                                                   = normal;
+      static const regex_constants::``[syntax_option_type]`` basic           
+                                                   = regex_constants::basic;
+      static const regex_constants::``[syntax_option_type]`` extended        
+                                                   = regex_constants::extended;
+      static const regex_constants::``[syntax_option_type]`` awk             
+                                                   = regex_constants::awk;
+      static const regex_constants::``[syntax_option_type]`` grep            
+                                                   = regex_constants::grep;
+      static const regex_constants::``[syntax_option_type]`` egrep           
+                                                   = regex_constants::egrep;
+      static const regex_constants::``[syntax_option_type]`` sed             
+                                                   = basic = regex_constants::sed;
+      static const regex_constants::``[syntax_option_type]`` perl            
+                                                   = regex_constants::perl;
+      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        
+                                                   = regex_constants::no_mod_m;
+      static const regex_constants::``[syntax_option_type]`` no_mod_s        
+                                                   = regex_constants::no_mod_s;
+      static const regex_constants::``[syntax_option_type]`` mod_s           
+                                                   = regex_constants::mod_s;
+      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      
+                                                   = regex_constants::bk_plus_qm;
+      static const regex_constants::``[syntax_option_type]`` bk_vbar         
+                                                   = regex_constants::bk_vbar
+      static const regex_constants::``[syntax_option_type]`` no_char_classes 
+                                                   = regex_constants::no_char_classes
+      static const regex_constants::``[syntax_option_type]`` no_intervals    
+                                                   = regex_constants::no_intervals
+
+      // common modifiers:
+      static const regex_constants::``[syntax_option_type]`` nosubs          
+                                                   = regex_constants::nosubs;
+      static const regex_constants::``[syntax_option_type]`` optimize        
+                                                   = regex_constants::optimize;
+      static const regex_constants::``[syntax_option_type]`` collate         
+                                                   = regex_constants::collate;
+      static const regex_constants::``[syntax_option_type]`` newline_alt     
+                                                   = regex_constants::newline_alt;
+      static const regex_constants::``[syntax_option_type]`` no_except       
+                                                   = regex_constants::newline_alt;
+
+      // construct/copy/destroy:
+      explicit ``[link boost_regex.basic_regex.construct1 basic_regex]`` ();
+      explicit ``[link boost_regex.basic_regex.construct2 basic_regex]``(const  charT* p, flag_type f = regex_constants::normal);
+      ``[link boost_regex.basic_regex.construct3 basic_regex]``(const charT* p1, const  charT* p2, 
+                  flag_type f = regex_constants::normal);
+      ``[link boost_regex.basic_regex.construct4 basic_regex]``(const charT* p, size_type len, flag_type  f);
+      ``[link boost_regex.basic_regex.construct5 basic_regex]``(const basic_regex&);
+
+      template <class ST, class SA>
+      explicit ``[link boost_regex.basic_regex.construct6 basic_regex]``(const basic_string<charT, ST,  SA>& p, 
+                           flag_type f = regex_constants::normal);
+
+      template <class InputIterator>
+      ``[link boost_regex.basic_regex.construct7 basic_regex]``(InputIterator first,  InputIterator last, 
+                  flag_type f = regex_constants::normal);
+
+      ~basic_regex();
+      ``[link boost_regex.basic_regex.opeq1 basic_regex& operator=]``(const basic_regex&);
+      ``[link boost_regex.basic_regex.opeq2 basic_regex& operator=]`` (const charT* ptr); 
+
+      template <class ST, class SA> 
+      ``[link boost_regex.basic_regex.opeq3 basic_regex& operator=]`` (const basic_string<charT, ST, SA>& p);
+      // iterators: 
+      ``[link boost_regex.basic_regex.begin const_iterator begin]``() const; 
+      ``[link boost_regex.basic_regex.end const_iterator end]``() const;
+      // capacity: 
+      ``[link boost_regex.basic_regex.size size_type size]``() const; 
+      ``[link boost_regex.basic_regex.max_size size_type max_size]``() const; 
+      ``[link boost_regex.basic_regex.empty bool empty]``() const; 
+      ``[link boost_regex.basic_regex.mark_count unsigned mark_count]``()const; 
+      //
+      // modifiers: 
+      ``[link boost_regex.basic_regex.assign1 basic_regex& assign]``(const basic_regex& that); 
+      ``[link boost_regex.basic_regex.assign2 basic_regex& assign]``(const charT* ptr, 
+                          flag_type f = regex_constants::normal);
+      ``[link boost_regex.basic_regex.assign3 basic_regex& assign]``(const charT* ptr, unsigned int len, flag_type f);
+
+      template <class string_traits, class A>
+      ``[link boost_regex.basic_regex.assign4 basic_regex& assign]``(const basic_string<charT, string_traits, A>& s,
+                          flag_type f = regex_constants::normal);
+
+      template <class InputIterator>
+      ``[link boost_regex.basic_regex.assign5 basic_regex& assign]``(InputIterator first, InputIterator last,
+                          flag_type f = regex_constants::normal);
+
+      // const operations:
+      ``[link boost_regex.basic_regex.flags flag_type flags]``() const;
+      ``[link boost_regex.basic_regex.status int status]``()const;
+      ``[link boost_regex.basic_regex.str basic_string<charT> str]``() const;
+      ``[link boost_regex.basic_regex.compare int compare]``(basic_regex&) const;
+      // locale:
+      ``[link boost_regex.basic_regex.imbue locale_type imbue]``(locale_type loc);
+      ``[link boost_regex.basic_regex.getloc locale_type getloc]``() const;
+      // swap
+      ``[link boost_regex.basic_regex.swap void swap]``(basic_regex&) throw();
+   };
+
+   template <class charT, class traits>
+   ``[link boost_regex.basic_regex.op_eq bool operator ==]`` (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+   template <class charT, class traits>
+   ``[link boost_regex.basic_regex.op_ne bool operator !=]`` (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+   template <class charT, class traits>
+   ``[link boost_regex.basic_regex.op_lt bool operator <]`` (const basic_regex<charT, traits>& lhs,
+                  const basic_regex<charT, traits>& rhs);
+
+   template <class charT, class traits>
+   ``[link boost_regex.basic_regex.op_le bool operator <=]`` (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+   template <class charT, class traits>
+   ``[link boost_regex.basic_regex.op_ge bool operator >=]`` (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+   template <class charT, class traits>
+   ``[link boost_regex.basic_regex.op_gt bool operator >]`` (const basic_regex<charT, traits>& lhs,
+                  const basic_regex<charT, traits>& rhs);
+
+   template <class charT, class io_traits, class re_traits>
+   basic_ostream<charT, io_traits>&
+      ``[link boost_regex.basic_regex.op_stream operator <<]`` (basic_ostream<charT, io_traits>& os,
+                  const basic_regex<charT, re_traits>& e);
+
+   template <class charT, class traits>
+   ``[link boost_regex.basic_regex.op_swap void swap]``(basic_regex<charT, traits>& e1,
+            basic_regex<charT, traits>& e2);
+
+   typedef basic_regex<char> regex;
+   typedef basic_regex<wchar_t> wregex;
+
+   } // namespace boost
+
+[h4 Description]
+
+Class `basic_regex` has the following public members:
+
+   // main option selection:
+   static const regex_constants::``[syntax_option_type]`` normal           
+                                             = regex_constants::normal;
+   static const regex_constants::``[syntax_option_type]`` ECMAScript       
+                                             = normal;
+   static const regex_constants::``[syntax_option_type]`` JavaScript       
+                                             = normal;
+   static const regex_constants::``[syntax_option_type]`` JScript          
+                                             = normal;
+   static const regex_constants::``[syntax_option_type]`` basic            
+                                             = regex_constants::basic;
+   static const regex_constants::``[syntax_option_type]`` extended         
+                                             = regex_constants::extended;
+   static const regex_constants::``[syntax_option_type]`` awk              
+                                             = regex_constants::awk;
+   static const regex_constants::``[syntax_option_type]`` grep             
+                                             = regex_constants::grep;
+   static const regex_constants::``[syntax_option_type]`` egrep            
+                                             = regex_constants::egrep;
+   static const regex_constants::``[syntax_option_type]`` sed              
+                                             = regex_constants::sed;
+   static const regex_constants::``[syntax_option_type]`` perl             
+                                             = regex_constants::perl;
+   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         
+                                             = regex_constants::no_mod_m;
+   static const regex_constants::``[syntax_option_type]`` no_mod_s         
+                                             = regex_constants::no_mod_s;
+   static const regex_constants::``[syntax_option_type]`` mod_s            
+                                             = regex_constants::mod_s;
+   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       
+                                             = regex_constants::bk_plus_qm;
+   static const regex_constants::``[syntax_option_type]`` bk_vbar          
+                                             = regex_constants::bk_vbar
+   static const regex_constants::``[syntax_option_type]`` no_char_classes  
+                                             = regex_constants::no_char_classes
+   static const regex_constants::``[syntax_option_type]`` no_intervals     
+                                             = regex_constants::no_intervals
+
+   // common modifiers:
+   static const regex_constants::``[syntax_option_type]`` nosubs           
+                                             = regex_constants::nosubs;
+   static const regex_constants::``[syntax_option_type]`` optimize         
+                                             = regex_constants::optimize;
+   static const regex_constants::``[syntax_option_type]`` collate          
+                                             = regex_constants::collate;
+   static const regex_constants::``[syntax_option_type]`` newline_alt      
+                                             = regex_constants::newline_alt;
+
+The meaning of these options is documented in the [syntax_option_type]
+section.
+
+The static constant members are provided as synonyms for the constants declared 
+in namespace `boost::regex_constants`; for each constant of type [syntax_option_type] 
+declared in namespace `boost::regex_constants` then a constant with the same name, 
+type and value is declared within the scope of basic_regex.
+
+[#boost_regex.basic_regex.construct1]
+
+   basic_regex();
+
+[*Effects]: Constructs an object of class `basic_regex`. 
+
+[table basic_regex default construction postconditions
+[[Element][Value]]
+[[`empty()`][`true`]]
+[[`size()`][`0`]]
+[[`str()`][`basic_string<charT>()`]]
+]
+
+[#boost_regex.basic_regex.construct2]
+
+   basic_regex(const charT* p, flag_type f = regex_constants::normal);
+
+[*Requires]: /p/ shall not be a null pointer.
+
+[*Throws]: [bad_expression] if /p/ is not a valid regular expression, 
+unless the flag `no_except` is set in /f/.
+
+[*Effects]: Constructs an object of class [basic_regex]; the object's internal 
+finite state machine is constructed from the regular expression contained 
+in the null-terminated string /p/, and interpreted according to the 
+[link boost_regex.ref.syntax_option_type option 
+flags] specified in /f/. 
+
+[table Postconditions for basic_regex construction
+[[Element][Value]]
+[[`empty()`][`false`]]
+[[`size()`][`char_traits<charT>::length(p)`]]
+[[`str()`][`basic_string<charT>(p)`]]
+[[`flags()`][['f]]]
+[[`mark_count()`][The number of marked sub-expressions within the expression.]]
+]
+
+[#boost_regex.basic_regex.construct3]
+
+   basic_regex(const charT* p1, const charT* p2, 
+               flag_type f = regex_constants::normal);
+
+[*Requires]: /p1/ and /p2/ are not null pointers, `p1 < p2`.
+
+[*Throws]: bad_expression if \[p1,p2) is not a valid regular expression, unless 
+the flag `no_except` is set in /f/.
+
+[*Effects]: Constructs an object of class [basic_regex]; the object's 
+internal finite state machine is constructed from the regular expression 
+contained in the sequence of characters \[p1,p2), and interpreted according the 
+[link boost_regex.ref.syntax_option_type option flags] specified in /f/. 
+
+[table Postconditions for basic_regex construction
+[[Element][Value]]
+[[`empty()`][`false`]]
+[[`size()`][`std::distance(p1,p2)`]]
+[[`str()`][`basic_string<charT>(p1,p2)`]]
+[[`flags()`][['f]]]
+[[`mark_count()`][The number of marked sub-expressions within the expression.]]
+]
+
+[#boost_regex.basic_regex.construct4]
+
+   basic_regex(const charT* p, size_type len, flag_type f);
+
+[*Requires]: /p/ shall not be a null pointer, `len < max_size()`.
+
+[*Throws]: [bad_expression] if /p/ is not a valid regular expression, unless 
+the flag `no_except` is set in /f/.
+
+[*Effects]: Constructs an object of class [basic_regex]; the object's 
+internal finite state machine is constructed from the regular expression 
+contained in the sequence of characters \[p, p+len), and interpreted 
+according the option flags specified in /f/. 
+
+[table Postconditions for basic_regex construction
+[[Element][Value]]
+[[`empty()`][`false`]]
+[[`size()`][['len]]]
+[[`str()`][`basic_string<charT>(p, len)`]]
+[[`flags()`][['f]]]
+[[`mark_count()`][The number of marked sub-expressions within the expression.]]
+]
+
+[#boost_regex.basic_regex.construct5]
+
+   basic_regex(const basic_regex& e);
+
+[*Effects]: Constructs an object of class [basic_regex] as a copy of the object 
+/e/. 
+
+[#boost_regex.basic_regex.construct6]
+
+   template <class ST, class SA>
+   basic_regex(const basic_string<charT, ST, SA>& s, 
+               flag_type f = regex_constants::normal);
+
+[*Throws]: [bad_expression] if /s/ is not a valid regular expression, 
+unless the flag `no_except` is set in /f/.
+
+[*Effects]: Constructs an object of class [basic_regex]; the object's 
+internal finite state machine is constructed from the regular expression 
+contained in the string /s/, and interpreted according to the [link boost_regex.ref.syntax_option_type option 
+flags] specified in /f/. 
+
+[table Postconditions for basic_regex construction
+[[Element][Value]]
+[[`empty()`][`false`]]
+[[`size()`][`s.size()`]]
+[[`str()`][['s]]]
+[[`flags()`][['f]]]
+[[`mark_count()`][The number of marked sub-expressions within the expression.]]
+]
+
+[#boost_regex.basic_regex.construct7]
+
+   template <class ForwardIterator>
+   basic_regex(ForwardIterator first, ForwardIterator last, 
+               flag_type f = regex_constants::normal);
+
+[*Throws]: [bad_expression] if the sequence \[first, last) is not a valid 
+regular expression, unless the flag `no_except` is set in /f/.
+
+[*Effects]: Constructs an object of class [basic_regex]; the object's 
+internal finite state machine is constructed from the regular expression 
+contained in the sequence of characters \[first, last), and interpreted 
+according to the [link boost_regex.ref.syntax_option_type option flags] specified in /f/. 
+
+[table Postconditions for basic_regex construction
+[[Element][Value]]
+[[`empty()`][`false`]]
+[[`size()`][`distance(first,last)`]]
+[[`str()`][`basic_string<charT>(first,last)`]]
+[[`flags()`][['f]]]
+[[`mark_count()`][The number of marked sub-expressions within the expression.]]
+]
+
+[#boost_regex.basic_regex.opeq1]
+
+   basic_regex& operator=(const basic_regex& e);
+
+[*Effects]: Returns the result of `assign(e.str(), e.flags())`.
+
+[#boost_regex.basic_regex.opeq2]
+
+   basic_regex& operator=(const charT* ptr);
+
+[*Requires]: /p/ shall not be a null pointer.
+
+[*Effects]: Returns the result of `assign(ptr)`.
+
+[#boost_regex.basic_regex.opeq3]
+
+   template <class ST, class SA>
+   basic_regex& operator=(const basic_string<charT, ST, SA>& p);
+
+[*Effects]: Returns the result of `assign(p)`.
+
+[#boost_regex.basic_regex.begin]
+
+   const_iterator begin() const;
+
+[*Effects]: Returns a starting iterator to a sequence of characters representing 
+the regular expression.
+
+[#boost_regex.basic_regex.end]
+
+   const_iterator end() const;
+
+[*Effects]: Returns termination iterator to a sequence of characters representing 
+the regular expression.
+
+[#boost_regex.basic_regex.size]
+
+   size_type size() const;
+
+[*Effects]: Returns the length of the sequence of characters representing the regular expression.
+
+[#boost_regex.basic_regex.max_size]
+
+   size_type max_size() const;
+
+[*Effects]: Returns the maximum length of the sequence of characters representing 
+the regular expression.
+
+[#boost_regex.basic_regex.empty]
+
+   bool empty() const;
+
+[*Effects]: Returns true if the object does not contain a valid regular expression, 
+otherwise false.
+
+[#boost_regex.basic_regex.mark_count]
+
+   unsigned mark_count() const;
+
+[*Effects]: Returns the number of marked sub-expressions within the regular expresion.
+
+[#boost_regex.basic_regex.assign1]
+
+   basic_regex& assign(const basic_regex& that);
+
+[*Effects]: Returns [link boost_regex.basic_regex.assign4 `assign(that.str(), that.flags())`].
+
+[#boost_regex.basic_regex.assign2]
+
+   basic_regex& assign(const charT* ptr, flag_type f = regex_constants::normal);
+
+[*Effects]: Returns [link boost_regex.basic_regex.assign4 `assign(string_type(ptr), f)`].
+
+[#boost_regex.basic_regex.assign3]
+
+   basic_regex& assign(const charT* ptr, unsigned int len, flag_type f);
+
+[*Effects]: Returns [link boost_regex.basic_regex.assign4 `assign(string_type(ptr, len), f)`].
+
+[#boost_regex.basic_regex.assign4]
+
+   template <class string_traits, class A>
+   basic_regex& assign(const basic_string<charT, string_traits, A>& s,
+                     flag_type f = regex_constants::normal);
+
+[*Throws]: [bad_expression] if /s/ is not a valid regular expression, 
+unless the flag `no_except` is set in /f/.
+
+[*Returns]: *this.
+
+[*Effects]: Assigns the regular expression contained in the string /s/, 
+interpreted according the [link boost_regex.ref.syntax_option_type option flags] 
+specified in /f/. 
+
+[table Postconditions for basic_regex::assign
+[[Element][Value]]
+[[`empty()`][`false`]]
+[[`size()`][`s.size()`]]
+[[`str()`][['s]]]
+[[`flags()`][['f]]]
+[[`mark_count()`][The number of marked sub-expressions within the expression.]]
+]
+
+[#boost_regex.basic_regex.assign5]
+
+   template <class InputIterator>
+   basic_regex& assign(InputIterator first, InputIterator last,
+                       flag_type f = regex_constants::normal);
+
+[*Requires]: The type `InputIterator` corresponds to the 
+[@http://input_iterator Input Iterator requirements 
+(24.1.1)].
+
+[*Effects]: Returns [link boost_regex.basic_regex.assign4 `assign(string_type(first, last), f)`].
+
+[#boost_regex.basic_regex.flags]
+
+   flag_type flags() const;
+
+[*Effects]: Returns a copy of the [link boost_regex.ref.syntax_option_type 
+regular expression syntax flags] that were passed to the object's constructor, 
+or the last call to `assign`.
+
+[#boost_regex.basic_regex.status]
+
+   int status() const;
+
+[*Effects]: Returns zero if the expression contains a valid regular expression, 
+otherwise an error code.  This member function is retained for use in 
+environments that cannot use exception handling.
+
+[#boost_regex.basic_regex.str]
+
+   basic_string<charT> str() const;
+
+[*Effects]: Returns a copy of the character sequence passed to the object's constructor, 
+or the last call to assign.
+
+[#boost_regex.basic_regex.compare]
+
+   int compare(basic_regex& e)const;
+
+[*Effects]: If `flags() == e.flags()` then returns `str().compare(e.str())`, 
+otherwise returns `flags() - e.flags()`.
+
+[#boost_regex.basic_regex.imbue]
+
+   locale_type imbue(locale_type l);
+
+[*Effects]: Returns the result of `traits_inst.imbue(l)` where `traits_inst` is 
+a (default initialized) instance of the template parameter `traits` stored 
+within the object. Calls to `imbue` invalidate any currently contained 
+regular expression.
+
+[*Postcondition]: `empty() == true`.
+
+[#boost_regex.basic_regex.getloc]
+
+   locale_type getloc() const;
+
+[*Effects]: Returns the result of `traits_inst.getloc()` where `traits_inst` is 
+a (default initialized) instance of the template parameter traits stored 
+within the object.
+
+[#boost_regex.basic_regex.swap]
+
+   void swap(basic_regex& e) throw();
+
+[*Effects]: Swaps the contents of the two regular expressions.
+
+[*Postcondition]: `*this` contains the regular expression that was in /e/, /e/ contains 
+the regular expression that was in `*this`.
+
+[*Complexity]: constant time.
+
+[note Comparisons between [basic_regex] objects are provided on an 
+experimental basis: please note that these are not present in the [tr1], 
+so use with care if you are writing code that may need to be ported
+to other implementations of [basic_regex].]
+
+[#boost_regex.basic_regex.op_eq]
+
+   template <class charT, class traits>
+   bool operator == (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+[*Effects]: Returns `lhs.compare(rhs) == 0`.
+
+[#boost_regex.basic_regex.op_ne]
+
+   template <class charT, class traits>
+   bool operator != (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+[*Effects]: Returns `lhs.compare(rhs) != 0`.
+
+[#boost_regex.basic_regex.op_lt]
+
+   template <class charT, class traits>
+   bool operator < (const basic_regex<charT, traits>& lhs,
+                  const basic_regex<charT, traits>& rhs);
+
+[*Effects]: Returns `lhs.compare(rhs) < 0`.
+
+[#boost_regex.basic_regex.op_le]
+
+   template <class charT, class traits>
+   bool operator <= (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+[*Effects]: Returns `lhs.compare(rhs) <= 0`.
+
+[#boost_regex.basic_regex.op_ge]
+
+   template <class charT, class traits>
+   bool operator >= (const basic_regex<charT, traits>& lhs,
+                     const basic_regex<charT, traits>& rhs);
+
+[*Effects]: Returns `lhs.compare(rhs) >= 0`.
+
+[#boost_regex.basic_regex.op_gt]
+
+   template <class charT, class traits>
+   bool operator > (const basic_regex<charT, traits>& lhs,
+                  const basic_regex<charT, traits>& rhs);
+
+[*Effects]: Returns `lhs.compare(rhs) > 0`.
+
+[note The basic_regex stream inserter is provided on an experimental basis, 
+and outputs the textual representation of the expression to the stream.]
+
+[#boost_regex.basic_regex.op_stream]
+
+   template <class charT, class io_traits, class re_traits>
+   basic_ostream<charT, io_traits>&
+      operator << (basic_ostream<charT, io_traits>& os
+                  const basic_regex<charT, re_traits>& e);
+
+[*Effects]: Returns `(os << e.str())`.
+
+[#boost_regex.basic_regex.op_swap]
+
+   template <class charT, class traits>
+   void swap(basic_regex<charT, traits>& lhs,
+            basic_regex<charT, traits>& rhs);
+
+[*Effects]: calls `lhs.swap(rhs)`.
+
+[endsect]
+
diff --git a/doc/captures.html b/doc/captures.html
deleted file mode 100644
index fe0232f8..00000000
--- a/doc/captures.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Understanding Captures</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Understanding Captures</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Captures are the iterator ranges that are "captured" by marked sub-expressions 
-         as a regular expression gets matched.&nbsp; Each marked sub-expression can 
-         result in more than one capture, if it is matched more than once.&nbsp; This 
-         document explains how captures and marked sub-expressions in Boost.Regex are 
-         represented and accessed.</P>
-      <H2>Marked sub-expressions</H2>
-      <P>Every time a Perl regular expression contains a parenthesis group (), it spits 
-         out an extra field, known as a marked sub-expression, for example the 
-         expression:</P>
-      <PRE>(\w+)\W+(\w+)</PRE>
-      <P>
-         Has two marked sub-expressions (known as $1 and $2 respectively), in addition 
-         the complete match is known as $&amp;, everything before the first match as $`, 
-         and everything after the match as $'.&nbsp; So if the above expression is 
-         searched for within "@abc def--", then we obtain:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="300" border="0">
-               <TR>
-                  <TD>
-                     <P dir="ltr" style="MARGIN-RIGHT: 0px">$`</P>
-                  </TD>
-                  <TD>"@"</TD>
-               </TR>
-               <TR>
-                  <TD>$&amp;</TD>
-                  <TD>"abc def"</TD>
-               </TR>
-               <TR>
-                  <TD>$1</TD>
-                  <TD>"abc"</TD>
-               </TR>
-               <TR>
-                  <TD>$2</TD>
-                  <TD>"def"</TD>
-               </TR>
-               <TR>
-                  <TD>$'</TD>
-                  <TD>"--"</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </BLOCKQUOTE>
-      <P>In Boost.regex all these are accessible via the <A href="match_results.html">match_results</A>
-         class that gets filled in when calling one of the matching algorithms (<A href="regex_search.html">regex_search</A>,
-         <A href="regex_match.html">regex_match</A>, or <A href="regex_iterator.html">regex_iterator</A>).&nbsp; 
-         So given:</P>
-      <PRE>boost::match_results&lt;IteratorType&gt; m;</PRE>
-      <P>The Perl and Boost.Regex equivalents are as follows:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>
-            <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="300" border="0">
-               <TR>
-                  <TD><STRONG>Perl</STRONG></TD>
-                  <TD><STRONG>Boost.Regex</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>$`</TD>
-                  <TD>m.prefix()</TD>
-               </TR>
-               <TR>
-                  <TD>$&amp;</TD>
-                  <TD>m[0]</TD>
-               </TR>
-               <TR>
-                  <TD>$n</TD>
-                  <TD>m[n]</TD>
-               </TR>
-               <TR>
-                  <TD>$'</TD>
-                  <TD>m.suffix()</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </BLOCKQUOTE>
-      <P>
-      <P>In Boost.Regex each sub-expression match is represented by a <A href="sub_match.html">
-            sub_match</A> object, this is basically just a pair of iterators denoting 
-         the start and end possition of the sub-expression match, but there are some 
-         additional operators provided so that objects of type sub_match behave a lot 
-         like a std::basic_string: for example they are implicitly <A href="sub_match.html#m3">
-            convertible to a basic_string</A>, they can be <A href="sub_match.html#o21">compared 
-            to a string</A>, <A href="sub_match.html#o81">added to a string</A>, or <A href="sub_match.html#oi">
-            streamed out to an output stream</A>.</P>
-      <H2>Unmatched Sub-Expressions</H2>
-      <P>When a regular expression match is found there is no need for all of the marked 
-         sub-expressions to have participated in the match, for example the expression:</P>
-      <P>(abc)|(def)</P>
-      <P>can match either $1 or $2, but never both at the same time.&nbsp; In 
-         Boost.Regex you can determine which sub-expressions matched by accessing the <A href="sub_match.html#m1">
-            sub_match::matched</A> data member.</P>
-      <H2>Repeated Captures</H2>
-      <P>When a marked sub-expression is repeated, then the sub-expression gets 
-         "captured" multiple times, however normally only the final capture is 
-         available, for example if</P>
-      <PRE>(?:(\w+)\W+)+</PRE>
-      <P>is matched against</P>
-      <PRE>one fine day</PRE>
-      <P>Then $1 will contain the string "day", and all the previous captures will have 
-         been forgotten.</P>
-      <P>However, Boost.Regex has an experimental feature that allows all the capture 
-         information to be retained - this is accessed either via the <A href="match_results.html#m17">
-            match_results::captures</A> member function or the <A href="sub_match.html#m8">sub_match::captures</A>
-         member function.&nbsp; These functions return a container that contains a 
-         sequence of all the captures obtained during the regular expression 
-         matching.&nbsp; The following example program shows how this information may be 
-         used:</P>
-      <PRE>#include &lt;boost/regex.hpp&gt;
-#include &lt;iostream&gt;
-
-
-void print_captures(const std::string&amp; regx, const std::string&amp; text)
-{
-   boost::regex e(regx);
-   boost::smatch what;
-   std::cout &lt;&lt; "Expression:  \"" &lt;&lt; regx &lt;&lt; "\"\n";
-   std::cout &lt;&lt; "Text:        \"" &lt;&lt; text &lt;&lt; "\"\n";
-   if(boost::regex_match(text, what, e, boost::match_extra))
-   {
-      unsigned i, j;
-      std::cout &lt;&lt; "** Match found **\n   Sub-Expressions:\n";
-      for(i = 0; i &lt; what.size(); ++i)
-         std::cout &lt;&lt; "      $" &lt;&lt; i &lt;&lt; " = \"" &lt;&lt; what[i] &lt;&lt; "\"\n";
-      std::cout &lt;&lt; "   Captures:\n";
-      for(i = 0; i &lt; what.size(); ++i)
-      {
-         std::cout &lt;&lt; "      $" &lt;&lt; i &lt;&lt; " = {";
-         for(j = 0; j &lt; what.captures(i).size(); ++j)
-         {
-            if(j)
-               std::cout &lt;&lt; ", ";
-            else
-               std::cout &lt;&lt; " ";
-            std::cout &lt;&lt; "\"" &lt;&lt; what.captures(i)[j] &lt;&lt; "\"";
-         }
-         std::cout &lt;&lt; " }\n";
-      }
-   }
-   else
-   {
-      std::cout &lt;&lt; "** No Match found **\n";
-   }
-}
-
-int main(int , char* [])
-{
-   print_captures("(([[:lower:]]+)|([[:upper:]]+))+", "aBBcccDDDDDeeeeeeee");
-   print_captures("(.*)bar|(.*)bah", "abcbar");
-   print_captures("(.*)bar|(.*)bah", "abcbah");
-   print_captures("^(?:(\\w+)|(?&gt;\\W+))*$", "now is the time for all good men to come to the aid of the party");
-   return 0;
-}</PRE>
-      <P>Which produces the following output:</P>
-      <PRE>Expression:  "(([[:lower:]]+)|([[:upper:]]+))+"
-Text:        "aBBcccDDDDDeeeeeeee"
-** Match found **
-   Sub-Expressions:
-      $0 = "aBBcccDDDDDeeeeeeee"
-      $1 = "eeeeeeee"
-      $2 = "eeeeeeee"
-      $3 = "DDDDD"
-   Captures:
-      $0 = { "aBBcccDDDDDeeeeeeee" }
-      $1 = { "a", "BB", "ccc", "DDDDD", "eeeeeeee" }
-      $2 = { "a", "ccc", "eeeeeeee" }
-      $3 = { "BB", "DDDDD" }
-Expression:  "(.*)bar|(.*)bah"
-Text:        "abcbar"
-** Match found **
-   Sub-Expressions:
-      $0 = "abcbar"
-      $1 = "abc"
-      $2 = ""
-   Captures:
-      $0 = { "abcbar" }
-      $1 = { "abc" }
-      $2 = { }
-Expression:  "(.*)bar|(.*)bah"
-Text:        "abcbah"
-** Match found **
-   Sub-Expressions:
-      $0 = "abcbah"
-      $1 = ""
-      $2 = "abc"
-   Captures:
-      $0 = { "abcbah" }
-      $1 = { }
-      $2 = { "abc" }
-Expression:  "^(?:(\w+)|(?&gt;\W+))*$"
-Text:        "now is the time for all good men to come to the aid of the party"
-** Match found **
-   Sub-Expressions:
-      $0 = "now is the time for all good men to come to the aid of the party"
-      $1 = "party"
-   Captures:
-      $0 = { "now is the time for all good men to come to the aid of the party" }
-      $1 = { "now", "is", "the", "time", "for", "all", "good", "men", "to", "come", "to", "the", "aid", "of", "the", "party" }
-</PRE>
-      <P>Unfortunately enabling this feature has an impact on performance (even if you 
-         don't use it), and a much bigger impact if you do use it, therefore to use this 
-         feature you need to:</P>
-      <UL>
-         <LI>
-            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 <A href="../../../boost/regex/user.hpp">
-               boost/regex/user.hpp</A>
-         and then rebuild everything.
-         <LI>
-            Pass the <A href="match_flag_type.html">match_extra flag</A> to the particular 
-            algorithms where you actually need the captures information (<A href="regex_search.html">regex_search</A>,
-            <A href="regex_match.html">regex_match</A>, or <A href="regex_iterator.html">regex_iterator</A>).
-         </LI>
-      </UL>
-      <P>
-         <HR>
-      <P></P>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         12&nbsp;Dec 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp; 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/captures.qbk b/doc/captures.qbk
new file mode 100644
index 00000000..08abbf9d
--- /dev/null
+++ b/doc/captures.qbk
@@ -0,0 +1,200 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:captures Understanding Marked Sub-Expressions and Captures]
+
+Captures are the iterator ranges that are "captured" by marked 
+sub-expressions as a regular expression gets matched.  Each marked 
+sub-expression can result in more than one capture, if it is matched 
+more than once.  This document explains how captures and marked 
+sub-expressions in Boost.Regex are represented and accessed.
+
+[h4 Marked sub-expressions]
+
+Every time a Perl regular expression contains a parenthesis group `()`, it 
+spits out an extra field, known as a marked sub-expression, 
+for example the expression:
+
+[pre (\w+)\W+(\w+)]
+
+Has two marked sub-expressions (known as $1 and $2 respectively), in 
+addition the complete match is known as $&, everything before the 
+first match as $\`, and everything after the match as $'.  So 
+if the above expression is searched for within `"@abc def--"`, then we obtain:
+
+[table
+[[Sub-expression][Text found]]
+[[$\`]["@"]]
+[[$&]["abc def"]]
+[[$1]["abc"]]
+[[$2]["def"]]
+[[$']["--"]]
+]
+
+In Boost.Regex all these are accessible via the [match_results] class that 
+gets filled in when calling one of the regular expression matching algorithms 
+([regex_search], [regex_match], or [regex_iterator]).  So given:
+
+   boost::match_results<IteratorType> m;
+
+The Perl and Boost.Regex equivalents are as follows:
+
+[table 
+[[Perl][Boost.Regex]]
+[[$\`][`m.prefix()`]]
+[[$&][`m[0]`]]
+[[$n][`m[n]`]]
+[[$\'][`m.suffix()`]]
+]
+
+In Boost.Regex each sub-expression match is represented by a [sub_match] object, 
+this is basically just a pair of iterators denoting the start and end 
+position of the sub-expression match, but there are some additional 
+operators provided so that objects of type [sub_match] behave a lot like a 
+`std::basic_string`: for example they are implicitly convertible to a 
+`basic_string`, they can be compared to a string, added to a string, or 
+streamed out to an output stream.
+
+[h4 Unmatched Sub-Expressions]
+
+When a regular expression match is found there is no need for all of the 
+marked sub-expressions to have participated in the match, for example the expression:
+
+[pre (abc)|(def)]
+
+can match either $1 or $2, but never both at the same time.  In Boost.Regex 
+you can determine which sub-expressions matched by accessing the 
+`sub_match::matched` data member.
+
+[h4 Repeated Captures]
+
+When a marked sub-expression is repeated, then the sub-expression gets 
+"captured" multiple times, however normally only the final capture is available, 
+for example if
+
+[pre (?:(\w+)\W+)+]
+
+is matched against
+
+[pre one fine day]
+
+Then $1 will contain the string "day", and all the previous captures will have 
+been forgotten.
+
+However, Boost.Regex has an experimental feature that allows all the capture 
+information to be retained - this is accessed either via the 
+`match_results::captures` member function or the `sub_match::captures` member 
+function.  These functions return a container that contains a sequence of all 
+the captures obtained during the regular expression matching.  The following 
+example program shows how this information may be used:
+
+   #include <boost/regex.hpp>
+   #include <iostream>
+
+   void print_captures(const std::string& regx, const std::string& text)
+   {
+      boost::regex e(regx);
+      boost::smatch what;
+      std::cout << "Expression:  \"" << regx << "\"\n";
+      std::cout << "Text:        \"" << text << "\"\n";
+      if(boost::regex_match(text, what, e, boost::match_extra))
+      {
+         unsigned i, j;
+         std::cout << "** Match found **\n   Sub-Expressions:\n";
+         for(i = 0; i < what.size(); ++i)
+            std::cout << "      $" << i << " = \"" << what[i] << "\"\n";
+         std::cout << "   Captures:\n";
+         for(i = 0; i < what.size(); ++i)
+         {
+            std::cout << "      $" << i << " = {";
+            for(j = 0; j < what.captures(i).size(); ++j)
+            {
+               if(j)
+                  std::cout << ", ";
+               else
+                  std::cout << " ";
+               std::cout << "\"" << what.captures(i)[j] << "\"";
+            }
+            std::cout << " }\n";
+         }
+      }
+      else
+      {
+         std::cout << "** No Match found **\n";
+      }
+   }
+
+   int main(int , char* [])
+   {
+      print_captures("(([[:lower:]]+)|([[:upper:]]+))+", "aBBcccDDDDDeeeeeeee");
+      print_captures("(.*)bar|(.*)bah", "abcbar");
+      print_captures("(.*)bar|(.*)bah", "abcbah");
+      print_captures("^(?:(\\w+)|(?>\\W+))*$", 
+         "now is the time for all good men to come to the aid of the party");
+      return 0;
+   }
+
+Which produces the following output:
+
+[pre 
+Expression:  "(([[:lower:\]\]+)|([[:upper:\]\]+))+"
+Text:        "aBBcccDDDDDeeeeeeee"
+'''**''' Match found '''**'''
+   Sub-Expressions:
+      $0 = "aBBcccDDDDDeeeeeeee"
+      $1 = "eeeeeeee"
+      $2 = "eeeeeeee"
+      $3 = "DDDDD"
+   Captures:
+      $0 = { "aBBcccDDDDDeeeeeeee" }
+      $1 = { "a", "BB", "ccc", "DDDDD", "eeeeeeee" }
+      $2 = { "a", "ccc", "eeeeeeee" }
+      $3 = { "BB", "DDDDD" }
+Expression:  "(.'''*''')bar|(.'''*''')bah"
+Text:        "abcbar"
+'''**''' Match found '''**'''
+   Sub-Expressions:
+      $0 = "abcbar"
+      $1 = "abc"
+      $2 = ""
+   Captures:
+      $0 = { "abcbar" }
+      $1 = { "abc" }
+      $2 = { }
+Expression:  "(.'''*''')bar|(.'''*''')bah"
+Text:        "abcbah"
+'''**''' Match found '''**'''
+   Sub-Expressions:
+      $0 = "abcbah"
+      $1 = ""
+      $2 = "abc"
+   Captures:
+      $0 = { "abcbah" }
+      $1 = { }
+      $2 = { "abc" }
+Expression:  "^(?:(\w+)|(?>\W+))'''*$'''"
+Text:        "now is the time for all good men to come to the aid of the party"
+'''**''' Match found '''**'''
+   Sub-Expressions:
+      $0 = "now is the time for all good men to come to the aid of the party"
+      $1 = "party"
+   Captures:
+      $0 = { "now is the time for all good men to come to the aid of the party" }
+      $1 = { "now", "is", "the", "time", "for", "all", "good", "men", "to", 
+         "come", "to", "the", "aid", "of", "the", "party" }
+]
+
+Unfortunately enabling this feature has an impact on performance 
+(even if you 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).
+    
+[endsect]
+
diff --git a/doc/character_class_names.html b/doc/character_class_names.html
deleted file mode 100644
index 576e45d0..00000000
--- a/doc/character_class_names.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Character Class Names</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Character Class Names.</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#always">Character Classes that are Always Supported</a> <dt><a href="#unicode">
-                  Character classes that are supported by Unicode Regular Expressions</a></dt>
-      </dl>
-      <H3><A name="always"></A>Character Classes that are Always Supported</H3>
-      <P>The following character class names are always supported by Boost.Regex:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Name</STRONG></TD>
-               <TD><STRONG>POSIX-standard name</STRONG></TD>
-               <TD><STRONG>Description</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>alnum</TD>
-               <TD>Yes</TD>
-               <TD>Any alpha-numeric character.</TD>
-            </TR>
-            <TR>
-               <TD>alpha</TD>
-               <TD>Yes</TD>
-               <TD>Any alphabetic character.</TD>
-            </TR>
-            <TR>
-               <TD>blank</TD>
-               <TD>Yes</TD>
-               <TD>Any whitespace character that is not a line separator.</TD>
-            </TR>
-            <TR>
-               <TD>cntrl</TD>
-               <TD>Yes</TD>
-               <TD>Any control character.</TD>
-            </TR>
-            <TR>
-               <TD>d</TD>
-               <TD>No</TD>
-               <TD>Any decimal digit</TD>
-            </TR>
-            <TR>
-               <TD>digit</TD>
-               <TD>Yes</TD>
-               <TD>Any decimal digit.</TD>
-            </TR>
-            <TR>
-               <TD>graph</TD>
-               <TD>Yes</TD>
-               <TD>Any graphical character.</TD>
-            </TR>
-            <TR>
-               <TD>l</TD>
-               <TD>No</TD>
-               <TD>Any lower case character.</TD>
-            </TR>
-            <TR>
-               <TD>lower</TD>
-               <TD>Yes</TD>
-               <TD>Any lower case character.</TD>
-            </TR>
-            <TR>
-               <TD>print</TD>
-               <TD>Yes</TD>
-               <TD>Any printable character.</TD>
-            </TR>
-            <TR>
-               <TD>punct</TD>
-               <TD>Yes</TD>
-               <TD>Any punctuation character.</TD>
-            </TR>
-            <TR>
-               <TD>s</TD>
-               <TD>No</TD>
-               <TD>Any whitespace character.</TD>
-            </TR>
-            <TR>
-               <TD>space</TD>
-               <TD>Yes</TD>
-               <TD>Any whitespace character.</TD>
-            </TR>
-            <TR>
-               <TD>unicode</TD>
-               <TD>No</TD>
-               <TD>Any extended character whose code point is above 255 in value.</TD>
-            </TR>
-            <TR>
-               <TD>u</TD>
-               <TD>No</TD>
-               <TD>Any upper case character.</TD>
-            </TR>
-            <TR>
-               <TD>upper</TD>
-               <TD>Yes</TD>
-               <TD>Any upper case character.</TD>
-            </TR>
-            <TR>
-               <TD>w</TD>
-               <TD>No</TD>
-               <TD>Any word character (alphanumeric characters plus the underscore).</TD>
-            </TR>
-            <TR>
-               <TD>word</TD>
-               <TD>No</TD>
-               <TD>Any word character (alphanumeric characters plus the underscore).</TD>
-            </TR>
-            <TR>
-               <TD>xdigit</TD>
-               <TD>Yes</TD>
-               <TD>Any hexadecimal digit character.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <H3><A name="unicode"></A>Character classes that are supported by Unicode Regular 
-            Expressions</H3>
-      <P>The following character classes are only supported by <A href="icu_strings.html">Unicode 
-            Regular Expressions</A>: that is those that use the u32regex type.&nbsp; The 
-         names used are the same as those from <A href="http://www.unicode.org/versions/Unicode4.0.0/ch04.pdf#G124142">
-            Chapter 4 of the Unicode standard</A>.</P>
-      <table width="100%" ID="Table3">
-         <tr>
-            <td><b>Short Name</b></td>
-            <td><b>Long Name</b></td>
-         </tr>
-         <tr>
-            <td>
-            </td>
-            <td>ASCII</td>
-         </tr>
-         <tr>
-            <td>
-            </td>
-            <td>Any</td>
-         </tr>
-         <tr>
-            <td>
-            </td>
-            <td>Assigned</td>
-         </tr>
-         <tr>
-            <td>C*</td>
-            <td>Other</td>
-         </tr>
-         <tr>
-            <td>Cc</td>
-            <td>Control</td>
-         </tr>
-         <tr>
-            <td>Cf</td>
-            <td>Format</td>
-         </tr>
-         <tr>
-            <td>Cn</td>
-            <td>Not Assigned</td>
-         </tr>
-         <tr>
-            <td>Co</td>
-            <td>Private Use</td>
-         </tr>
-         <tr>
-            <td>Cs</td>
-            <td>Surrogate</td>
-         </tr>
-         <tr>
-            <td>L*</td>
-            <td>Letter</td>
-         </tr>
-         <tr>
-            <td>Ll</td>
-            <td>Lowercase Letter</td>
-         </tr>
-         <tr>
-            <td>Lm</td>
-            <td>Modifier Letter</td>
-         </tr>
-         <tr>
-            <td>Lo</td>
-            <td>Other Letter</td>
-         </tr>
-         <tr>
-            <td>Lt</td>
-            <td>Titlecase</td>
-         </tr>
-         <tr>
-            <td>Lu</td>
-            <td>Uppercase Letter</td>
-         </tr>
-         <tr>
-            <td>M*</td>
-            <td>Mark</td>
-         </tr>
-         <tr>
-            <td>Mc</td>
-            <td>Spacing Combining Mark</td>
-         </tr>
-         <tr>
-            <td>Me</td>
-            <td>Enclosing Mark</td>
-         </tr>
-         <tr>
-            <td>Mn</td>
-            <td>Non-Spacing Mark</td>
-         </tr>
-         <tr>
-            <td>N*</td>
-            <td>Number</td>
-         </tr>
-         <tr>
-            <td>Nd</td>
-            <td>Decimal Digit Number</td>
-         </tr>
-         <tr>
-            <td>Nl</td>
-            <td>Letter Number</td>
-         </tr>
-         <tr>
-            <td>No</td>
-            <td>Other Number</td>
-         </tr>
-         <tr>
-            <td>P*</td>
-            <td>Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pc</td>
-            <td>Connector Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pd</td>
-            <td>Dash Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pe</td>
-            <td>Close Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pf</td>
-            <td>Final Punctuation</td>
-         </tr>
-         <tr>
-            <td>Pi</td>
-            <td>Initial Punctuation</td>
-         </tr>
-         <tr>
-            <td>Po</td>
-            <td>Other Punctuation</td>
-         </tr>
-         <tr>
-            <td>Ps</td>
-            <td>Open Punctuation</td>
-         </tr>
-         <tr>
-            <td>S*</td>
-            <td>Symbol</td>
-         </tr>
-         <tr>
-            <td>Sc</td>
-            <td>Currency Symbol</td>
-         </tr>
-         <tr>
-            <td>Sk</td>
-            <td>Modifier Symbol</td>
-         </tr>
-         <tr>
-            <td>Sm</td>
-            <td>Math Symbol</td>
-         </tr>
-         <tr>
-            <td>So</td>
-            <td>Other Symbol</td>
-         </tr>
-         <tr>
-            <td>Z*</td>
-            <td>Separator</td>
-         </tr>
-         <tr>
-            <td>Zl</td>
-            <td>Line Separator</td>
-         </tr>
-         <tr>
-            <td>Zp</td>
-            <td>Paragraph Separator</td>
-         </tr>
-         <tr>
-            <td>Zs</td>
-            <td>Space Separator</td>
-         </tr>
-      </table>
-      <HR>
-      <P></P>
-      <P></P>
-      <p>Revised&nbsp;&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         10&nbsp;Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004-5</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/character_class_names.qbk b/doc/character_class_names.qbk
new file mode 100644
index 00000000..e4771aa5
--- /dev/null
+++ b/doc/character_class_names.qbk
@@ -0,0 +1,92 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:character_classes Character Class Names]
+
+[section:std_char_clases Character Classes that are Always Supported]
+
+The following character class names are always supported by Boost.Regex:
+
+[table
+[[Name] 	[POSIX-standard name] 	[Description]]
+[[alnum] 	[Yes] 	[Any alpha-numeric character.]]
+[[alpha] 	[Yes] 	[Any alphabetic character.]]
+[[blank] 	[Yes] 	[Any whitespace character that is not a line separator.]]
+[[cntrl] 	[Yes] 	[Any control character.]]
+[[d] 	      [No] 	[Any decimal digit]]
+[[digit] 	[Yes] 	[Any decimal digit.]]
+[[graph] 	[Yes] 	[Any graphical character.]]
+[[l] 	      [No] 	[Any lower case character.]]
+[[lower] 	[Yes] 	[Any lower case character.]]
+[[print] 	[Yes] 	[Any printable character.]]
+[[punct] 	[Yes] 	[Any punctuation character.]]
+[[s] 	      [No] 	[Any whitespace character.]]
+[[space] 	[Yes] 	[Any whitespace character.]]
+[[unicode] 	[No] 	[Any extended character whose code point is above 255 in value.]]
+[[u] 	      [No] 	[Any upper case character.]]
+[[upper] 	[Yes] 	[Any upper case character.]]
+[[w] 	      [No] 	[Any word character (alphanumeric characters plus the underscore).]]
+[[word] 	   [No] 	[Any word character (alphanumeric characters plus the underscore).]]
+[[xdigit] 	[Yes] 	[Any hexadecimal digit character.]]
+]
+
+[endsect]
+
+[section:optional_char_class_names Character classes that are supported by Unicode Regular Expressions]
+
+The following character classes are only supported by Unicode Regular Expressions: 
+that is those that use the `u32regex` type.  The names used are the same as 
+those from Chapter 4 of the Unicode standard.
+
+[table
+[[Short Name] 	[Long Name]]
+[[ ]	[ASCII]]
+[[ ]	[Any]]
+[[ ]	[Assigned]]
+[[C*] 	[Other]]
+[[Cc] 	[Control]]
+[[Cf] 	[Format]]
+[[Cn] 	[Not Assigned]]
+[[Co] 	[Private Use]]
+[[Cs] 	[Surrogate]]
+[[L*] 	[Letter]]
+[[Ll] 	[Lowercase Letter]]
+[[Lm] 	[Modifier Letter]]
+[[Lo] 	[Other Letter]]
+[[Lt] 	[Titlecase]]
+[[Lu] 	[Uppercase Letter]]
+[[M*] 	[Mark]]
+[[Mc] 	[Spacing Combining Mark]]
+[[Me] 	[Enclosing Mark]]
+[[Mn] 	[Non-Spacing Mark]]
+[[N*] 	[Number]]
+[[Nd] 	[Decimal Digit Number]]
+[[Nl] 	[Letter Number]]
+[[No] 	[Other Number]]
+[[P*] 	[Punctuation]]
+[[Pc] 	[Connector Punctuation]]
+[[Pd] 	[Dash Punctuation]]
+[[Pe] 	[Close Punctuation]]
+[[Pf] 	[Final Punctuation]]
+[[Pi] 	[Initial Punctuation]]
+[[Po] 	[Other Punctuation]]
+[[Ps] 	[Open Punctuation]]
+[[S*] 	[Symbol]]
+[[Sc] 	[Currency Symbol]]
+[[Sk] 	[Modifier Symbol]]
+[[Sm] 	[Math Symbol]]
+[[So] 	[Other Symbol]]
+[[Z*] 	[Separator]]
+[[Zl] 	[Line Separator]]
+[[Zp] 	[Paragraph Separator]]
+[[Zs] 	[Space Separator]]
+]
+
+[endsect]
+[endsect]
+
diff --git a/doc/collating_names.html b/doc/collating_names.html
deleted file mode 100644
index c553f1ed..00000000
--- a/doc/collating_names.html
+++ /dev/null
@@ -1,368 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Collating Element Names</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Collating Element Names</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#digraphs">Digraphs</A></dt>
-         <dt><A href="#posix">POSIX Symbolic Names</A></dt>
-         <dt><A href="#unicode">Unicode Symbolic Names</A></dt>
-      </dl>
-      <H3><A name="digraphs"></A>Digraphs</H3>
-      <P>The following are treated as valid digraphs when used as a collating name:</P>
-      <P>"ae", "Ae", "AE", "ch", "Ch", "CH", "ll", "Ll", "LL", "ss", "Ss", "SS", "nj", 
-         "Nj", "NJ", "dz", "Dz", "DZ", "lj", "Lj", "LJ".</P>
-      <H3><A name="posix"></A>POSIX Symbolic Names</H3>
-      <P>The following symbolic names are recognised as valid collating element names, 
-         in addition to any single character:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="50%" border="1">
-            <TR>
-               <TD><STRONG>Name</STRONG></TD>
-               <TD><STRONG>Character</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>NUL</TD>
-               <TD>\x00</TD>
-            </TR>
-            <TR>
-               <TD>SOH</TD>
-               <TD>\x01</TD>
-            </TR>
-            <TR>
-               <TD>STX</TD>
-               <TD>\x02</TD>
-            </TR>
-            <TR>
-               <TD>ETX</TD>
-               <TD>\x03</TD>
-            </TR>
-            <TR>
-               <TD>EOT</TD>
-               <TD>\x04</TD>
-            </TR>
-            <TR>
-               <TD>ENQ</TD>
-               <TD>\x05</TD>
-            </TR>
-            <TR>
-               <TD>ACK</TD>
-               <TD>\x06</TD>
-            </TR>
-            <TR>
-               <TD>alert</TD>
-               <TD>\x07</TD>
-            </TR>
-            <TR>
-               <TD>backspace</TD>
-               <TD>\x08</TD>
-            </TR>
-            <TR>
-               <TD>tab</TD>
-               <TD>\t</TD>
-            </TR>
-            <TR>
-               <TD>newline</TD>
-               <TD>\n</TD>
-            </TR>
-            <TR>
-               <TD>vertical-tab</TD>
-               <TD>\v</TD>
-            </TR>
-            <TR>
-               <TD>form-feed</TD>
-               <TD>\f</TD>
-            </TR>
-            <TR>
-               <TD>carriage-return</TD>
-               <TD>\r</TD>
-            </TR>
-            <TR>
-               <TD>SO</TD>
-               <TD>\xE</TD>
-            </TR>
-            <TR>
-               <TD>SI</TD>
-               <TD>\xF</TD>
-            </TR>
-            <TR>
-               <TD>DLE</TD>
-               <TD>\x10</TD>
-            </TR>
-            <TR>
-               <TD>DC1</TD>
-               <TD>\x11</TD>
-            </TR>
-            <TR>
-               <TD>DC2</TD>
-               <TD>\x12</TD>
-            </TR>
-            <TR>
-               <TD>DC3</TD>
-               <TD>\x13</TD>
-            </TR>
-            <TR>
-               <TD>DC4</TD>
-               <TD>\x14</TD>
-            </TR>
-            <TR>
-               <TD>NAK</TD>
-               <TD>\x15</TD>
-            </TR>
-            <TR>
-               <TD>SYN</TD>
-               <TD>\x16</TD>
-            </TR>
-            <TR>
-               <TD>ETB</TD>
-               <TD>\x17</TD>
-            </TR>
-            <TR>
-               <TD>CAN</TD>
-               <TD>\x18</TD>
-            </TR>
-            <TR>
-               <TD>EM</TD>
-               <TD>\x19</TD>
-            </TR>
-            <TR>
-               <TD>SUB</TD>
-               <TD>\x1A</TD>
-            </TR>
-            <TR>
-               <TD>ESC</TD>
-               <TD>\x1B</TD>
-            </TR>
-            <TR>
-               <TD>IS4</TD>
-               <TD>\x1C</TD>
-            </TR>
-            <TR>
-               <TD>IS3</TD>
-               <TD>\x1D</TD>
-            </TR>
-            <TR>
-               <TD>IS2</TD>
-               <TD>\x1E</TD>
-            </TR>
-            <TR>
-               <TD>IS1</TD>
-               <TD>\x1F</TD>
-            </TR>
-            <TR>
-               <TD>space</TD>
-               <TD>\x20</TD>
-            </TR>
-            <TR>
-               <TD>exclamation-mark</TD>
-               <TD>!</TD>
-            </TR>
-            <TR>
-               <TD>quotation-mark</TD>
-               <TD>"</TD>
-            </TR>
-            <TR>
-               <TD>number-sign</TD>
-               <TD>#</TD>
-            </TR>
-            <TR>
-               <TD>dollar-sign</TD>
-               <TD>$</TD>
-            </TR>
-            <TR>
-               <TD>percent-sign</TD>
-               <TD>%</TD>
-            </TR>
-            <TR>
-               <TD>ampersand</TD>
-               <TD>&amp;</TD>
-            </TR>
-            <TR>
-               <TD>apostrophe</TD>
-               <TD>'</TD>
-            </TR>
-            <TR>
-               <TD>left-parenthesis</TD>
-               <TD>(</TD>
-            </TR>
-            <TR>
-               <TD>right-parenthesis</TD>
-               <TD>)</TD>
-            </TR>
-            <TR>
-               <TD>asterisk</TD>
-               <TD>*</TD>
-            </TR>
-            <TR>
-               <TD>plus-sign</TD>
-               <TD>+</TD>
-            </TR>
-            <TR>
-               <TD>comma</TD>
-               <TD>,</TD>
-            </TR>
-            <TR>
-               <TD>hyphen</TD>
-               <TD>-</TD>
-            </TR>
-            <TR>
-               <TD>period</TD>
-               <TD>.</TD>
-            </TR>
-            <TR>
-               <TD>slash</TD>
-               <TD>/</TD>
-            </TR>
-            <TR>
-               <TD>zero</TD>
-               <TD>0</TD>
-            </TR>
-            <TR>
-               <TD>one</TD>
-               <TD>1</TD>
-            </TR>
-            <TR>
-               <TD>two</TD>
-               <TD>2</TD>
-            </TR>
-            <TR>
-               <TD>three</TD>
-               <TD>3</TD>
-            </TR>
-            <TR>
-               <TD>four</TD>
-               <TD>4</TD>
-            </TR>
-            <TR>
-               <TD>five</TD>
-               <TD>5</TD>
-            </TR>
-            <TR>
-               <TD>six</TD>
-               <TD>6</TD>
-            </TR>
-            <TR>
-               <TD>seven</TD>
-               <TD>7</TD>
-            </TR>
-            <TR>
-               <TD>eight</TD>
-               <TD>8</TD>
-            </TR>
-            <TR>
-               <TD>nine</TD>
-               <TD>9</TD>
-            </TR>
-            <TR>
-               <TD>colon</TD>
-               <TD>:</TD>
-            </TR>
-            <TR>
-               <TD>semicolon</TD>
-               <TD>;</TD>
-            </TR>
-            <TR>
-               <TD>less-than-sign</TD>
-               <TD>&lt;</TD>
-            </TR>
-            <TR>
-               <TD>equals-sign</TD>
-               <TD>=</TD>
-            </TR>
-            <TR>
-               <TD>greater-than-sign</TD>
-               <TD>&gt;</TD>
-            </TR>
-            <TR>
-               <TD>question-mark</TD>
-               <TD>?</TD>
-            </TR>
-            <TR>
-               <TD>commercial-at</TD>
-               <TD>@</TD>
-            </TR>
-            <TR>
-               <TD>left-square-bracket</TD>
-               <TD>[</TD>
-            </TR>
-            <TR>
-               <TD>backslash</TD>
-               <TD>\</TD>
-            </TR>
-            <TR>
-               <TD>right-square-bracket</TD>
-               <TD>]</TD>
-            </TR>
-            <TR>
-               <TD>circumflex</TD>
-               <TD>~</TD>
-            </TR>
-            <TR>
-               <TD>underscore</TD>
-               <TD>_</TD>
-            </TR>
-            <TR>
-               <TD>grave-accent</TD>
-               <TD>`</TD>
-            </TR>
-            <TR>
-               <TD>left-curly-bracket</TD>
-               <TD>{</TD>
-            </TR>
-            <TR>
-               <TD>vertical-line</TD>
-               <TD>|</TD>
-            </TR>
-            <TR>
-               <TD>right-curly-bracket</TD>
-               <TD>}</TD>
-            </TR>
-            <TR>
-               <TD>tilde</TD>
-               <TD>~</TD>
-            </TR>
-            <TR>
-               <TD>DEL</TD>
-               <TD>\x7F</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <H3><A name="unicode"></A>Named Unicode Characters</H3>
-      <P>When using <A href="icu_strings.html">Unicode aware regular expressions</A> (with 
-         the <EM>u32regex </EM>type), all the normal symbolic names for Unicode 
-         characters (those given in Unidata.txt) are recognised.</P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised 12 Jan 2005 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004-2005</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/collating_names.qbk b/doc/collating_names.qbk
new file mode 100644
index 00000000..6f7aab97
--- /dev/null
+++ b/doc/collating_names.qbk
@@ -0,0 +1,128 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:collating_names Collating Names]
+
+[section:digraphs Digraphs]
+
+The following are treated as valid digraphs when used as a collating name:
+
+"ae", "Ae", "AE", "ch", "Ch", "CH", "ll", "Ll", "LL", "ss", "Ss", "SS", "nj", "Nj", "NJ", "dz", "Dz", "DZ", "lj", "Lj", "LJ".
+
+So for example the expression:
+
+[pre \[\[.ae.\]-c\] ]
+
+will match any character that collates between the digraph "ae" and the character "c".
+
+[endsect]
+
+[section:posix_symbolic_names POSIX Symbolic Names]
+
+The following symbolic names are recognised as valid collating element names, 
+in addition to any single character, this allows you to write for example:
+
+[pre \[\[.left-square-bracket.\]\[.right-square-bracket.\]\]]
+
+if you wanted to match either "\[" or "\]".
+
+[table
+[[Name][Character]]
+[[NUL] 	[\\x00]]
+[[SOH] 	[\\x01]]
+[[STX] 	[\\x02]]
+[[ETX] 	[\\x03]]
+[[EOT] 	[\\x04]]
+[[ENQ] 	[\\x05]]
+[[ACK] 	[\\x06]]
+[[alert] 	[\\x07]]
+[[backspace] 	[\\x08]]
+[[tab] 	[\\t]]
+[[newline] 	[\\n]]
+[[vertical-tab] 	[\\v]]
+[[form-feed] 	[\\f]]
+[[carriage-return] 	[\\r]]
+[[SO] 	[\\xE]]
+[[SI] 	[\\xF]]
+[[DLE] 	[\\x10]]
+[[DC1] 	[\\x11]]
+[[DC2] 	[\\x12]]
+[[DC3] 	[\\x13]]
+[[DC4] 	[\\x14]]
+[[NAK] 	[\\x15]]
+[[SYN] 	[\\x16]]
+[[ETB] 	[\\x17]]
+[[CAN] 	[\\x18]]
+[[EM] 	[\\x19]]
+[[SUB] 	[\\x1A]]
+[[ESC] 	[\\x1B]]
+[[IS4] 	[\\x1C]]
+[[IS3] 	[\\x1D]]
+[[IS2] 	[\\x1E]]
+[[IS1] 	[\\x1F]]
+[[space] 	[\\x20]]
+[[exclamation-mark] 	[!]]
+[[quotation-mark] 	["]]
+[[number-sign] 	[#]]
+[[dollar-sign] 	[$]]
+[[percent-sign] 	[%]]
+[[ampersand] 	[&]]
+[[apostrophe] 	[\']]
+[[left-parenthesis] 	[(]]
+[[right-parenthesis] 	[)]]
+[[asterisk] 	[\*]]
+[[plus-sign] 	[+]]
+[[comma] 	[,]]
+[[hyphen] 	[-]]
+[[period] 	[.]]
+[[slash] 	[ / ]]
+[[zero] 	[0]]
+[[one] 	[1]]
+[[two] 	[2]]
+[[three] 	[3]]
+[[four] 	[4]]
+[[five] 	[5]]
+[[six] 	[6]]
+[[seven] 	[7]]
+[[eight] 	[8]]
+[[nine] 	[9]]
+[[colon] 	[\:]]
+[[semicolon] 	[;]]
+[[less-than-sign] 	[<]]
+[[equals-sign] 	[=]]
+[[greater-than-sign] 	[>]]
+[[question-mark] 	[?]]
+[[commercial-at] 	[@]]
+[[left-square-bracket] 	[\[]]
+[[backslash][\\]]
+[[right-square-bracket][\]]]
+[[circumflex][~]]
+[[underscore][_]]
+[[grave-accent][`]]
+[[left-curly-bracket][{]]
+[[vertical-line][|]]
+[[right-curly-bracket][}]]
+[[tilde][~]]
+[[DEL][\\x7F]]
+]
+
+[endsect]
+
+[section:named_unicode Named Unicode Characters]
+
+When using [link boost_regex.unicode Unicode aware regular expressions] (with the `u32regex` type), all 
+the normal symbolic names for Unicode characters (those given in Unidata.txt) 
+are recognised.  So for example:
+
+[pre \[\[.CYRILLIC CAPITAL LETTER I.\]\] ]
+
+would match the Unicode character 0x0418.
+
+[endsect]
+[endsect]
+
diff --git a/doc/concepts.html b/doc/concepts.html
deleted file mode 100644
index ed598933..00000000
--- a/doc/concepts.html
+++ /dev/null
@@ -1,453 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Index</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Concepts</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3><A name="charT"></A>charT requirements</H3>
-      <P>Type charT used a template argument to <A href="basic_regex.html">class template 
-            basic_regex</A>, must have a trivial default constructor, copy constructor, 
-         assignment operator, and destructor.&nbsp; In addition the following 
-         requirements must be met for objects; c of type charT, c1 and c2 of type charT 
-         const, and i of type int:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Expression</STRONG></TD>
-               <TD><STRONG>Return type</STRONG></TD>
-               <TD><STRONG>Assertion / Note / Pre- / Post-condition</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>charT c</TD>
-               <TD>charT</TD>
-               <TD>Default constructor (must be trivial).</TD>
-            </TR>
-            <TR>
-               <TD>charT c(c1)</TD>
-               <TD>charT</TD>
-               <TD>Copy constructor (must be trivial).</TD>
-            </TR>
-            <TR>
-               <TD>c1 = c2</TD>
-               <TD>charT</TD>
-               <TD>Assignment operator (must be trivial).</TD>
-            </TR>
-            <TR>
-               <TD>c1 == c2</TD>
-               <TD>bool</TD>
-               <TD>true if&nbsp;c1 has the same value&nbsp;as c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 != c2</TD>
-               <TD>bool</TD>
-               <TD>true if c1 and c2 are not equal.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &lt; c2</TD>
-               <TD>bool</TD>
-               <TD>true if the value of c1 is less than c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &gt; c2</TD>
-               <TD>bool</TD>
-               <TD>true if the value of c1 is greater than c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &lt;= c2</TD>
-               <TD>bool</TD>
-               <TD>true if c1 is less than or equal to c2.</TD>
-            </TR>
-            <TR>
-               <TD>c1 &gt;= c2</TD>
-               <TD>bool</TD>
-               <TD>true if c1 is greater than or equal to c2.</TD>
-            </TR>
-            <TR>
-               <TD>intmax_t i = c1</TD>
-               <TD>int</TD>
-               <TD>
-                  <P>charT must be convertible to an integral type.</P>
-                  <P>Note: type charT is not required to support this operation, if the traits class 
-                     used supports the full Boost-specific interface, rather than&nbsp;the minimal 
-                     standardised-interface (see traits class requirements below).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>charT c(i);</TD>
-               <TD>charT</TD>
-               <TD>charT must be constructable from an integral type.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="traits"></A>traits requirements</H3>
-      <P>There are two sets of requirements for the traits template argument to 
-         basic_regex: a mininal interface (which is part of the regex standardization 
-         proposal), and an optional Boost-specific enhanced interface.</P>
-      <H4>Minimal requirements.</H4>
-      <P>In the following table X denotes a traits class defining types and functions 
-         for the character container type charT; u is an object of type X; v is an 
-         object of type const X; p is a value of type const charT*; I1 and I2 are Input 
-         Iterators; c is a value of type const charT; s is an object of type 
-         X::string_type; cs is an object of type const X::string_type; b is a value of 
-         type bool; I is a value of type int; F1 and F2 are values of type const charT*; 
-         and loc is an object of type X::locale_type.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="1" cellPadding="7" width="100%" border="1">
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P><STRONG>Expression</STRONG></P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P><STRONG>Return type</STRONG></P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P><STRONG>Assertion / Note
-                        <BR>
-                        Pre / Post condition</STRONG></P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>charT</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>The character container type used in the implementation of class template <CODE>basic_regex</CODE>.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::size_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>&nbsp;</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>An unsigned integer type, capable of holding the length of a null-terminated 
-                     string of charT's.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>std::basic_string&lt;charT&gt; or std::vector&lt;charT&gt;</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::locale_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>Implementation defined</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>A copy constructible type that represents the locale used by the traits class.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_class_type</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>Implementation defined</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>A bitmask type representing a particular character classification. Multiple 
-                     values of this type can be bitwise-or'ed together to obtain a new valid value.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>X::length(p)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::size_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Yields the smallest <CODE>i</CODE> such that <CODE>p[i] == 0</CODE>. Complexity 
-                     is linear in <CODE>i</CODE>.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.translate(c)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a character such that for any character d that is to be considered 
-                     equivalent to c then v.translate(c) == v.translate(d).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.translate_nocase(c)</P>
-               </TD>
-               <TD vAlign="top" width="28%">X::char_type</TD>
-               <TD vAlign="top" width="45%">For all characters C that are to be considered 
-                  equivalent to c when comparisons are to be performed without regard to case, 
-                  then v.translate_- nocase(c) == v.translate_- nocase(C).</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.transform(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a sort key for the character sequence designated by the iterator range 
-                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
-                     character sequence [H1, H2) then v.transform(G1, G2) &lt; v.transform(H1, 
-                     H2).&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.transform_primary(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a sort key for the character sequence designated by the iterator range 
-                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
-                     character sequence [H1, H2) when character case is not considered then 
-                     v.transform_primary(G1, G2) &lt; v.transform_- primary(H1, H2).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.lookup_classname(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::char_class_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Converts the character sequence designated by the iterator range [F1,F2) into a 
-                     bitmask type that can subsequently be passed to isctype. Values returned from 
-                     lookup_classname can be safely bitwise or'ed together. Returns 0 if the 
-                     character sequence is not the name of a character class recognized by X. The 
-                     value returned shall be independent of the case of the characters in the 
-                     sequence.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.lookup_collatename(F1, F2)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::string_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a sequence of characters that represents the collating element 
-                     consisting of the character sequence designated by the iterator range [F1, F2). 
-                     Returns an empty string if the character sequence is not a valid collating 
-                     element.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.isctype(c, v.lookup_classname (F1, F2))</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>bool</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns true if character c is a member of the character class designated by 
-                     the iterator range [F1, F2), false otherwise.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.value(c, i)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>int</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns the value represented by the digit c in base I if the character c is a 
-                     valid digit in base I; otherwise returns -1. [Note: the value of I will only be 
-                     8, 10, or 16. -end note]</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>u.imbue(loc)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::locale_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Imbues <CODE>u</CODE> with the locale <CODE>loc</CODE>, returns the previous 
-                     locale used by u if any.&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.getloc()</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>X::locale_type</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns the current locale used by <CODE>v</CODE> if any.&nbsp;</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="28%">
-                  <P>v.error_string(i)</P>
-               </TD>
-               <TD vAlign="top" width="28%">
-                  <P>std::string</P>
-               </TD>
-               <TD vAlign="top" width="45%">
-                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
-                     where <CODE>i</CODE> is one of the values enumerated by type <CODE>regex_constants::error_type</CODE>.&nbsp; 
-                     If the value <CODE>i</CODE> is not recognized then returns the string "Unknown 
-                     error" or a localized equivalent.</P>
-               </TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4>Additional Optional Requirements</H4>
-      <P>The following additional requirements are strictly optional, however in order 
-         for basic_regex to take advantage of these additional interfaces, all of the 
-         following requirements must be met; basic_regex will detect the presence or 
-         absense of member <EM>boost_extensions_tag </EM>and configure itself 
-         appropriately.</P>
-      <P>
-         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Expression</STRONG></TD>
-               <TD width="231"><STRONG>Result</STRONG></TD>
-               <TD>
-                  <P><STRONG>Assertion / Note
-                        <BR>
-                        Pre / Post condition</STRONG></P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>X::boost_extensions_tag</TD>
-               <TD width="231">An unspecified type.</TD>
-               <TD>When present, all of the extensions listed in this table must be present.</TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.syntax_type(c)</P>
-               </TD>
-               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::syntax_type</A></TD>
-               <TD>
-                  <P>Returns a symbolic value of type <CODE>regex_constants::syntax_type </CODE>that 
-                     signifies the meaning of character <CODE>c</CODE> within the regular expression 
-                     grammar.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>v.escape_syntax_type(c)</TD>
-               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::escape_syntax_type</A></TD>
-               <TD>
-                  <P>Returns a symbolic value of type <CODE>regex_constants::escape_syntax_type</CODE>, 
-                     that signifies the meaning of character <CODE>c</CODE>&nbsp;within the regular 
-                     expression grammar, when <CODE>c</CODE> has been preceded by an escape 
-                     character. Precondition: if <CODE>b</CODE> is the character preceding <CODE>c</CODE>
-                     in the expression being parsed then: <CODE>v.syntax_type(b) == syntax_escape</CODE></P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.translate(c, b)</P>
-               </TD>
-               <TD width="231">X::char_type</TD>
-               <TD>
-                  <P>Returns a character <CODE>d</CODE> such that: for any character <CODE>d</CODE> that 
-                     is to be considered equivalent to <CODE>c</CODE>&nbsp;then <CODE>v.translate(c,false)==v.translate(d,false)</CODE>. 
-                     Likewise for all characters <CODE>C</CODE> that are to be considered equivalent 
-                     to <CODE>c</CODE> when comparisons are to be performed without regard to case, 
-                     then <CODE>v.translate(c,true)==v.translate(C,true)</CODE>.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.toi(I1, I2, i)</P>
-               </TD>
-               <TD width="231">An integer type capable of holding either a charT or an int.</TD>
-               <TD>
-                  <P>Behaves as follows: if <CODE>p==q</CODE> or if <CODE>*p </CODE>is not a digit 
-                     character then returns -1. Otherwise performs formatted numeric input on the 
-                     sequence [p,q) and returns the result as an int. Postcondition: either <CODE>p == 
-                        q</CODE> or <CODE>*p</CODE> is a non-digit character.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>v.error_string(i)</P>
-               </TD>
-               <TD width="231">std::string</TD>
-               <TD>
-                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
-                     where <CODE>i</CODE> is one of the values enumerated by type <CODE><A href="error_type.html">
-                           regex_constants::error_type</A></CODE>.&nbsp; If the value <CODE>i</CODE> 
-                     is not recognized then returns the string "Unknown error" or a localized 
-                     equivalent.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>v.tolower(c)</TD>
-               <TD width="231">X::char_type</TD>
-               <TD>Converts c to lower case, used for Perl-style \l and \L formating operations.</TD>
-            </TR>
-            <TR>
-               <TD>v.toupper(c)</TD>
-               <TD width="231">X::char_type</TD>
-               <TD>Converts c to upper case, used for Perl-style \u and \U formating operations.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="iterator"></A>Iterator Rrequirements</H3>
-      <P>
-      <P>The regular expression algorithms (and iterators) take all require a 
-         Bidirectional-Iterator.</P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/concepts.qbk b/doc/concepts.qbk
new file mode 100644
index 00000000..58822659
--- /dev/null
+++ b/doc/concepts.qbk
@@ -0,0 +1,108 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:concepts Concepts]
+
+[section:charT_concept charT Requirements]
+
+Type `charT` used a template argument to class template [basic_regex], 
+must have a trivial default constructor, copy constructor, 
+assignment operator, and destructor.  In addition the following requirements 
+must be met for objects; /c/ of type `charT`, /c1/ and /c2/ of type `charT const`, 
+and /i/ of type `int`:
+
+[table
+[[Expression] 	[Return type] 	[Assertion / Note / Pre- / Post-condition]]
+[[charT c] 	[charT] 	[Default constructor (must be trivial).]]
+[[charT c(c1)] 	[charT] 	[Copy constructor (must be trivial).]]
+[[c1 = c2] 	[charT] 	[Assignment operator (must be trivial).]]
+[[c1 == c2] 	[bool] 	[true if c1 has the same value as c2.]]
+[[c1 != c2] 	[bool] 	[true if c1 and c2 are not equal.]]
+[[c1 < c2]     [bool] 	[true if the value of c1 is less than c2.]]
+[[c1 > c2] 	[bool] 	[true if the value of c1 is greater than c2.]]
+[[c1 <= c2] 	[bool] 	[true if c1 is less than or equal to c2.]]
+[[c1 >= c2] 	[bool] 	[true if c1 is greater than or equal to c2.]]
+[[intmax_t i = c1] 	[int 	] [charT must be convertible to an integral type.
+
+Note: type charT is not required to support this operation, if the traits class used supports the full Boost-specific interface, rather than the minimal standardised-interface (see traits class requirements below).]]
+[[charT c(i);] 	[charT] 	[charT must be constructable from an integral type.]]
+]
+
+[endsect]
+
+[section:traits_concept Traits Class Requirements]
+
+There are two sets of requirements for the `traits` template argument to 
+[basic_regex]: a mininal interface (which is part of the regex standardization proposal), 
+and an optional Boost-specific enhanced interface.
+
+[h4 Minimal requirements.]
+
+In the following table `X` denotes a traits class defining types and functions for 
+the character container type `charT`; /u/ is an object of type `X`; /v/ is 
+an object of type `const X`; /p/ is a value of type `const charT*`; 
+/I1/ and /I2/ are Input Iterators; /c/ is a value of type `const charT`; 
+/s/ is an object of type `X::string_type`; /cs/ is an object of type 
+`const X::string_type`; /b/ is a value of type `bool`; /I/ is a value of 
+type `int`; /F1/ and /F2/ are values of type `const charT*`; and /loc/ is 
+an object of type `X::locale_type`.
+
+[table
+[[Expression][Return type][Assertion / Note Pre / Post condition]]
+[[X::char_type][charT][The character container type used in the implementation of class template basic_regex.]]
+[[X::size_type][][An unsigned integer type, capable of holding the length of a null-terminated string of charT's.]]
+[[X::string_type][std::basic_string<charT> or std::vector<charT>][]]
+[[X::locale_type][Implementation defined][A copy constructible type that represents the locale used by the traits class.]]
+[[X::char_class_type][Implementation defined][A bitmask type representing a particular character classification. Multiple values of this type can be bitwise-or'ed together to obtain a new valid value.]]
+[[X::length(p)][X::size_type][Yields the smallest i such that p\[i\] == 0. Complexity is linear in i.]]
+[[v.translate(c)][X::char_type][Returns a character such that for any character d that is to be considered equivalent to c then v.translate(c) == v.translate(d).]]
+[[v.translate_nocase(c)][X::char_type][For all characters C that are to be considered equivalent to c when comparisons are to be performed without regard to case, then v.translate_nocase(c) == v.translate_nocase(C).]]
+[[v.transform(F1, F2)][X::string_type][Returns a sort key for the character sequence designated by the iterator range \[F1, F2) such that if the character sequence \[G1, G2) sorts before the character sequence [H1, H2) then v.transform(G1, G2) < v.transform(H1, H2). ]]
+[[v.transform_primary(F1, F2)][X::string_type][Returns a sort key for the character sequence designated by the iterator range \[F1, F2) such that if the character sequence [G1, G2) sorts before the character sequence \[H1, H2) when character case is not considered then v.transform_primary(G1, G2) < v.transform_primary(H1, H2).]]
+[[v.lookup_classname(F1, F2)][X::char_class_type][Converts the character sequence designated by the iterator range \[F1,F2) into a bitmask type that can subsequently be passed to isctype. Values returned from lookup_classname can be safely bitwise or'ed together. Returns 0 if the character sequence is not the name of a character class recognized by X. The value returned shall be independent of the case of the characters in the sequence.]]
+[[v.lookup_collatename(F1, F2)][X::string_type][Returns a sequence of characters that represents the collating element consisting of the character sequence designated by the iterator range \[F1, F2). Returns an empty string if the character sequence is not a valid collating element.]]
+[[v.isctype(c, v.lookup_classname (F1, F2))][bool][Returns true if character c is a member of the character class designated by the iterator range \[F1, F2), false otherwise.]]
+[[v.value(c, i)][int][Returns the value represented by the digit c in base I if the character c is a valid digit in base I; otherwise returns -1. \[Note: the value of I will only be 8, 10, or 16. -end note\]]]
+[[u.imbue(loc)][X::locale_type][Imbues u with the locale loc, returns the previous locale used by u if any. ]]
+[[v.getloc()][X::locale_type][Returns the current locale used by v if any. ]]
+[[v.error_string(i)][std::string][Returns a human readable error string for the error condition i, where i is one of the values enumerated by type regex_constants::error_type.  If the value i is not recognized then returns the string "Unknown error" or a localized equivalent.]]
+]
+
+[h4 Additional Optional Requirements]
+
+The following additional requirements are strictly optional, 
+however in order for [basic_regex] to take advantage of these additional 
+interfaces, all of the following requirements must be met; [basic_regex] 
+will detect the presence or absense of the member `boost_extensions_tag` and 
+configure itself appropriately.
+
+
+[table 
+[[Expression][Result][Assertion / Note Pre / Post condition]]
+[[X::boost_extensions_tag][An unspecified type.][When present, all of the extensions listed in this table must be present.]]
+[[v.syntax_type(c)][regex_constants::syntax_type][Returns a symbolic value of type regex_constants::syntax_type that signifies the meaning of character c within the regular expression grammar.]]
+[[v.escape_syntax_type(c)][regex_constants::escape_syntax_type][Returns a symbolic value of type regex_constants::escape_syntax_type, that signifies the meaning of character c within the regular expression grammar, when c has been preceded by an escape character. Precondition: if b is the character preceding c in the expression being parsed then: `v.syntax_type(b) == syntax_escape`]]
+[[v.translate(c, b)][X::char_type][Returns a character d such that: for any character d that is to be considered equivalent to c then `v.translate(c,false)==v.translate(d,false)`. Likewise for all characters C that are to be considered equivalent to c when comparisons are to be performed without regard to case, then `v.translate(c,true)==v.translate(C,true)`.]]
+[[v.toi(I1, I2, i)][An integer type capable of holding either a charT or an int.][Behaves as follows: if `p == q` or if `*p` is not a digit character then returns -1. Otherwise performs formatted numeric input on the sequence \[p,q) and returns the result as an int. Postcondition: either p == q or *p is a non-digit character.]]
+[[v.error_string(i)][std::string][Returns a human readable error string for the error condition i, where i is one of the values enumerated by type regex_constants::error_type.  If the value i is not recognized then returns the string "Unknown error" or a localized equivalent.]]
+[[v.tolower(c)][X::char_type][Converts c to lower case, used for Perl-style \l and \L formating operations.]]
+[[v.toupper(c)][X::char_type][Converts c to upper case, used for Perl-style \u and \U formating operations.]]
+]
+
+[endsect]
+
+[section:iterator_concepts Iterator Rrequirements]
+
+The regular expression algorithms (and iterators) take all require a 
+Bidirectional-Iterator.
+
+[endsect]
+
+[endsect]
+
+
diff --git a/doc/configuration.html b/doc/configuration.html
deleted file mode 100644
index 9da777e7..00000000
--- a/doc/configuration.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Configuration and setup</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Configuration and setup</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h2>Contents</h2>
-      <dl class="index">
-         <dt><a href="#compiler">Compiler setup</a> <dt><a href="#locale">Locale and traits class 
-                  selection</a> <dt><a href="#linkage">Linkage Options</a> <dt><a href="#algorithm">Algorithm 
-                        Selection</a> <dt><a href="#tuning">Algorithm Tuning</a></dt>
-      </dl>
-      <h3><a name="compiler"></a>Compiler setup.</h3>
-      <p>You shouldn't need to do anything special to configure boost.regex for use with 
-         your compiler - the <a href="../../config/index.html">boost.config</a> subsystem 
-         should already take care of it, if you do have problems (or you are using a 
-         particularly obscure compiler or platform) then <a href="../../config/index.html">boost.config</a>&nbsp;has 
-         a&nbsp;<a href="../../config/config.htm#config_script">configure</a> script.</p>
-      <h3><a name="locale"></a>Locale and traits class selection.</h3>
-      <p>The following macros (see <a href="../../../boost/regex/user.hpp">user.hpp</a>) 
-         control how boost.regex interacts with the user's locale:</p>
-      <table id="Table2" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td width="265">BOOST_REGEX_USE_C_LOCALE</td>
-            <td>
-               Forces boost.regex to use the global C locale in its traits class support: this 
-               is now deprecated in favour of the C++ locale.</td>
-         </tr>
-         <tr>
-            <td width="265">BOOST_REGEX_USE_CPP_LOCALE</td>
-            <td>Forces boost.regex to use std::locale in it's default traits class, regular 
-               expressions can then be imbued with an instance&nbsp;specific locale.&nbsp; 
-               This is the default behaviour on non-Windows platforms.</td>
-         </tr>
-         <tr>
-            <td width="265">BOOST_REGEX_NO_W32</td>
-            <td>Tells boost.regex not to use any Win32 API's even when available (implies 
-               BOOST_REGEX_USE_CPP_LOCALE unless BOOST_REGEX_USE_C_LOCALE is set).</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3><a name="linkage"></a>Linkage Options</h3>
-      <table id="Table3" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td>BOOST_REGEX_DYN_LINK</td>
-            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
-               link to the dll build of the boost.regex.&nbsp; By default boost.regex will 
-               link to its static library build, even if the dynamic C runtime library is in 
-               use.</td>
-         </tr>
-         <tr>
-            <td>BOOST_REGEX_NO_LIB</td>
-            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
-               not automatically select the library to link to.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3><a name="algorithm"></a>Algorithm Selection</h3>
-      <table id="Table4" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td width="253">BOOST_REGEX_RECURSIVE</td>
-            <td>Tells boost.regex to use a stack-recursive matching algorithm.&nbsp; This is 
-               generally the fastest option (although there is very little in it), but can 
-               cause stack overflow in extreme cases, on Win32 this can be handled safely, but 
-               this is not the case on other platforms.</td>
-         </tr>
-         <tr>
-            <td width="253">BOOST_REGEX_NON_RECURSIVE</td>
-            <td>Tells boost.regex to use a non-stack recursive matching algorithm, this can be 
-               slightly slower than the alternative, but is always safe no matter how 
-               pathological the regular expression.&nbsp; This is the default on non-Win32 
-               platforms.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3><a name="tuning"></a>Algorithm Tuning</h3>
-      <p>The following option applies only if BOOST_REGEX_RECURSIVE is set.</p>
-      <table id="Table6" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td>BOOST_REGEX_HAS_MS_STACK_GUARD</td>
-            <td>Tells boost.regex that Microsoft style __try - __except blocks are supported, 
-               and can be used to safely trap stack overflow.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>The following options apply only if BOOST_REGEX_NON_RECURSIVE is set.</p>
-      <table id="Table5" cellspacing="1" cellpadding="1" width="100%" border="1">
-         <tr>
-            <td>BOOST_REGEX_BLOCKSIZE</td>
-            <td>In non-recursive mode, boost.regex uses largish blocks of memory to act as a 
-               stack for the state machine, the larger the block size then the fewer 
-               allocations that will take place.&nbsp; This defaults to 4096 bytes, which is 
-               large enough to match the vast majority of regular expressions&nbsp;without 
-               further allocations, however, you can choose smaller or larger values depending 
-               upon your platforms characteristics.</td>
-         </tr>
-         <tr>
-            <td>BOOST_REGEX_MAX_BLOCKS</td>
-            <td>Tells boost.regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is 
-               permitted to use.&nbsp; If this value is exceeded then boost.regex will stop 
-               trying to find a match and throw a std::runtime_error.&nbsp; Defaults to 1024, 
-               don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE by much.</td>
-         </tr>
-         <tr>
-            <td>BOOST_REGEX_MAX_CACHE_BLOCKS</td>
-            <td>Tells boost.regex how many memory blocks to store in it's internal cache - 
-               memory blocks are taken from this cache rather than by calling ::operator 
-               new.&nbsp; Generally speeking this can be an order of magnitude faster than 
-               calling ::opertator new each time a memory block is required, but has the 
-               downside that boost.regex can end up caching a large chunk of memory (by 
-               default up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size).&nbsp; If memory is 
-               tight then try defining this to 0 (disables all caching), or if that is too 
-               slow, then a value of 1 or 2, may be sufficient.&nbsp; On the other hand, on 
-               large multi-processor, multi-threaded systems, you may find that a higher value 
-               is in order.</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         23 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/configuration.qbk b/doc/configuration.qbk
new file mode 100644
index 00000000..2acb55bb
--- /dev/null
+++ b/doc/configuration.qbk
@@ -0,0 +1,86 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:configuration Configuration]
+
+[section:compiler Compiler Setup]
+
+You shouldn't need to do anything special to configure Boost.Regex for use 
+with your compiler - the [@../../../config/index.html Boost.Config subsystem] should already take care of it, 
+if you do have problems (or you are using a particularly obscure compiler 
+or platform) then [@../../../config/index.html Boost.Config] has a configure script that you can run.
+
+[endsect]
+
+[section:locale Locale and traits class selection]
+
+The following macros (see [@../../../../boost/regex/user.hpp user.hpp]) control how Boost.Regex interacts with 
+the user's locale:
+
+[table
+[[macro][description]]
+[[BOOST_REGEX_USE_C_LOCALE][Forces Boost.Regex to use the global C locale in its traits class support: this is now deprecated in favour of the C++ locale.]]
+[[BOOST_REGEX_USE_CPP_LOCALE][Forces Boost.Regex to use std::locale in it's default traits class, regular expressions can then be imbued with an instance specific locale.  This is the default behaviour on non-Windows platforms.]]
+[[BOOST_REGEX_NO_W32][Tells Boost.Regex not to use any Win32 API's even when available (implies BOOST_REGEX_USE_CPP_LOCALE unless BOOST_REGEX_USE_C_LOCALE is set).]]
+]
+
+[endsect]
+
+
+[section:linkage Linkage Options]
+
+[table
+[[macro][description]]
+[[BOOST_REGEX_DYN_LINK][For Microsoft and Borland C++ builds, this tells Boost.Regex that it should link to the dll build of the Boost.Regex.  By default boost.regex will link to its static library build, even if the dynamic C runtime library is in use.]]
+[[BOOST_REGEX_NO_LIB][For Microsoft and Borland C++ builds, this tells Boost.Regex that it should not automatically select the library to link to.]]
+]
+
+[endsect]
+
+[section:algorithm Algorithm Selection]
+
+[table
+[[macro][description]]
+[[BOOST_REGEX_RECURSIVE][Tells Boost.Regex to use a stack-recursive matching algorithm.  This is generally the fastest option (although there is very little in it), but can cause stack overflow in extreme cases, on Win32 this can be handled safely, but this is not the case on other platforms.]]
+[[BOOST_REGEX_NON_RECURSIVE][Tells Boost.Regex to use a non-stack recursive matching algorithm, this can be slightly slower than the alternative, but is always safe no matter how pathological the regular expression.  This is the default on non-Win32 platforms.]]
+]
+
+[endsect]
+
+[section:tuning Algorithm Tuning]
+
+The following option applies only if BOOST_REGEX_RECURSIVE is set.
+
+[table
+[[macro][description]]
+[[BOOST_REGEX_HAS_MS_STACK_GUARD][Tells Boost.Regex that Microsoft style __try - __except blocks are supported, and can be used to safely trap stack overflow.]]
+]
+
+
+The following options apply only if BOOST_REGEX_NON_RECURSIVE is set.
+
+[table
+[[macro][description]]
+[[BOOST_REGEX_BLOCKSIZE][In non-recursive mode, Boost.Regex uses largish blocks of memory to act as a stack for the state machine, the larger the block size then the fewer allocations that will take place.  This defaults to 4096 bytes, which is large enough to match the vast majority of regular expressions without further allocations, however, you can choose smaller or larger values depending upon your platforms characteristics.]]
+[[BOOST_REGEX_MAX_BLOCKS][Tells Boost.Regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is permitted to use.  If this value is exceeded then Boost.Regex will stop trying to find a match and throw a std::runtime_error.  Defaults to 1024, don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE by much.]]
+[[BOOST_REGEX_MAX_CACHE_BLOCKS][Tells Boost.Regex how many memory blocks to store in 
+         it's internal cache - memory blocks are taken from this cache rather than by calling 
+         ::operator new.  Generally speeking this can be an order of magnitude faster than 
+         calling ::opertator new each time a memory block is required, but has the 
+         downside that Boost.Regex can end up caching a large chunk of memory (by default 
+         up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size).  If memory is tight then try 
+         defining this to 0 (disables all caching), or if that is too slow, then a value of 
+         1 or 2, may be sufficient.  On the other hand, on large multi-processor, 
+multi-threaded systems, you may find that a higher value is in order.]]
+]
+
+[endsect]
+
+[endsect]
+
+
diff --git a/doc/contacts.html b/doc/contacts.html
deleted file mode 100644
index 645460ec..00000000
--- a/doc/contacts.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Contacts</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Contacts and Acknowledgements</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <BR>
-      <BR>
-      <HR>
-      <P>The author can be contacted at john@johnmaddock.co.uk;&nbsp;the home page for 
-         this library is at <A href="http://www.boost.org">www.boost.org</A>.</P>
-      <P>I am indebted to <A href="http://www.cs.princeton.edu/~rs/">Robert Sedgewick's 
-            "Algorithms in C++" </A>for forcing me to think about algorithms and their 
-         performance, and to the folks at <A href="http://www.boost.org">boost</A> for 
-         forcing me to <I>think</I>, period.</P>
-      <P><A href="http://www.boost-consulting.com">Eric Niebler</A>, author of the <A href="http://research.microsoft.com/projects/greta">
-            GRETA regular expression component</A>, has shared several important ideas, 
-         in a series of long discussions.</P>
-      <P>Pete Becker, of <A href="http://www.dinkumware.com/">Dinkumware Ltd</A>, has 
-         helped enormously with the standardisation proposal language.</P>
-      <P>The following people have all contributed useful comments or fixes: Dave 
-         Abrahams, Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan Bölsche, 
-         Beman Dawes, Paul Baxter, David Bergman, David Dennerline, Edward Diener, Peter 
-         Dimov, Robert Dunn, Fabio Forno, Tobias Gabrielsson, Rob Gillen, Marc Gregoire, 
-         Chris Hecker, Nick Hodapp, Jesse Jones, Martin Jost, Boris Krasnovskiy, Jan 
-         Hermelink, Max Leung, Wei-hao Lin, Jens Maurer, Richard Peters, Heiko Schmidt, 
-         Jason Shirk, Gerald Slacik, Scobie Smith, Mike Smyth, Alexander Sokolovsky, 
-         Hervé Poirier, Michael Raykh, Marc Recht, Scott VanCamp, Bruno Voigt, Alexey 
-         Voinov, Jerry Waldorf, Rob Ward, Lealon Watts, John Wismar, Thomas Witt and 
-         Yuval Yosef. I am also grateful to the manuals supplied with the Henry Spencer, 
-         Perl and GNU regular expression libraries - wherever possible I have tried to 
-         maintain compatibility with these libraries and with the POSIX standard - the 
-         code however is entirely my own, including any bugs! I can absolutely guarantee 
-         that I will not fix any bugs I don't know about, so if you have any comments or 
-         spot any bugs, please get in touch.</P>
-      <P>Useful further information can be found at:</P>
-      <P>Short&nbsp;tutorials on regular expressions can be <A href="http://etext.lib.virginia.edu/helpsheets/regex.html">
-            found here</A> and&nbsp;<A href="http://www.linuxpcug.org/lessons/regexp.html">here</A>.</P>
-      <P>The main book on regular expressions is <A href="http://www.oreilly.com/catalog/regex/">
-            Mastering Regular Expressions, published by O'Reilly</A>.</P>
-      <P>Information on the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            Boost.regex standardization proposal</A>, along with other <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1475.html">
-            standard library extension proposals</A> can be found on the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/">
-            C++ Committees web pages</A>.</P>
-      <P>The<a href="http://www.opengroup.org/onlinepubs/7908799/toc.htm">Open Unix 
-            Specification</a> contains a wealth of useful material, including the 
-         regular expression syntax, and specifications for <a href="http://www.opengroup.org/onlinepubs/7908799/xsh/regex.h.html">
-            &lt;regex.h&gt;</a> and <a href="http://www.opengroup.org/onlinepubs/7908799/xsh/nl_types.h.html">
-            &lt;nl_types.h&gt;</a>.</P>
-      <p>The <a href="http://www.cs.ucr.edu/~stelo/pattern.html">Pattern Matching Pointers</a>
-         site is a "must visit" resource for anyone interested in pattern matching.</p>
-      <p><a href="http://glimpse.cs.arizona.edu/">Glimpse and Agrep</a>, use a 
-         simplified regular expression syntax to achieve faster search times.</p>
-      <p><a href="http://glimpse.cs.arizona.edu/udi.html">Udi Manber</a> and <a href="http://www.dcc.uchile.cl/~rbaeza/">
-            Ricardo Baeza-Yates</a> both have a selection of useful pattern matching 
-         papers available from their respective web sites.</p>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/error_type.html b/doc/error_type.html
deleted file mode 100644
index 6ca14383..00000000
--- a/doc/error_type.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: error_type</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">error_type</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>Type error type represents the different types of errors that can be raised by 
-         the library when parsing a regular expression.</P>
-      <pre>
-namespace boost{ namespace regex_constants{
-
-typedef implementation-specific-type error_type;
-
-static const error_type error_collate;
-static const error_type error_ctype;
-static const error_type error_escape;
-static const error_type error_backref;
-static const error_type error_brack;
-static const error_type error_paren;
-static const error_type error_brace;
-static const error_type error_badbrace;
-static const error_type error_range;
-static const error_type error_space;
-static const error_type error_badrepeat;
-static const error_type error_complexity;
-static const error_type error_stack;
-static const error_type error_bad_pattern;
-
-} // namespace regex_constants
-} // namespace boost
-</pre>
-      <P>&nbsp;</P>
-      <H3><A name="description"></A>Description</H3>
-      <P>The type error_type is an implementation-specific enumeration type that may 
-         take one of the following values:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Constant</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>error_collate</TD>
-               <TD>An invalid collating element was specified in a [[.name.]] block.</TD>
-            </TR>
-            <TR>
-               <TD>error_ctype</TD>
-               <TD>An invalid character class name was specified in a [[:name:]] block.</TD>
-            </TR>
-            <TR>
-               <TD>error_escape</TD>
-               <TD>An invalid or trailing escape was encountered.</TD>
-            </TR>
-            <TR>
-               <TD>error_backref</TD>
-               <TD>A back-reference to a non-existant marked sub-expression was encountered.</TD>
-            </TR>
-            <TR>
-               <TD>error_brack</TD>
-               <TD>An invalid character set [...] was encountered.</TD>
-            </TR>
-            <TR>
-               <TD>error_paren</TD>
-               <TD>
-                  <P>Mismatched '(' and ')'.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>error_brace</TD>
-               <TD>Mismatched '{' and '}'.</TD>
-            </TR>
-            <TR>
-               <TD>error_badbrace</TD>
-               <TD>Invalid contents of a {...} block.</TD>
-            </TR>
-            <TR>
-               <TD>error_range</TD>
-               <TD>A character range was invalid, for example [d-a].</TD>
-            </TR>
-            <TR>
-               <TD>error_space</TD>
-               <TD>Out of memory.</TD>
-            </TR>
-            <TR>
-               <TD>error_badrepeat</TD>
-               <TD>An attempt to repeat something that can not be repeated - for example a*+</TD>
-            </TR>
-            <TR>
-               <TD>error_complexity</TD>
-               <TD>The expression became too complex to handle.</TD>
-            </TR>
-            <TR>
-               <TD>error_stack</TD>
-               <TD>Out of program stack space.</TD>
-            </TR>
-            <TR>
-               <TD>error_bad_pattern</TD>
-               <TD>Other unspecified errors.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="examples"></A>
-         <HR>
-      </H3>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-      </p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/error_type.qbk b/doc/error_type.qbk
new file mode 100644
index 00000000..70441998
--- /dev/null
+++ b/doc/error_type.qbk
@@ -0,0 +1,63 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:error_type error_type]
+
+[h4 Synopsis]
+
+Type error type represents the different types of errors that can be raised 
+by the library when parsing a regular expression.
+
+   namespace boost{ namespace regex_constants{
+
+   typedef implementation-specific-type error_type;
+
+   static const error_type error_collate;
+   static const error_type error_ctype;
+   static const error_type error_escape;
+   static const error_type error_backref;
+   static const error_type error_brack;
+   static const error_type error_paren;
+   static const error_type error_brace;
+   static const error_type error_badbrace;
+   static const error_type error_range;
+   static const error_type error_space;
+   static const error_type error_badrepeat;
+   static const error_type error_complexity;
+   static const error_type error_stack;
+   static const error_type error_bad_pattern;
+
+   } // namespace regex_constants
+   } // namespace boost
+
+ 
+[h4 Description]
+
+The type `error_type` is an implementation-specific enumeration type that may 
+take one of the following values:
+
+[table
+[[Constant][Meaning]]
+[[error_collate][An invalid collating element was specified in a \[\[.name.\]\] block.]]
+[[error_ctype][An invalid character class name was specified in a \[\[:name:\]\] block.]]
+[[error_escape][An invalid or trailing escape was encountered.]]
+[[error_backref][A back-reference to a non-existant marked sub-expression was encountered.]]
+[[error_brack][An invalid character set \[...\] was encountered.]]
+[[error_paren][Mismatched '(' and ')'.]]
+[[error_brace][Mismatched '{' and '}'.]]
+[[error_badbrace][Invalid contents of a {...} block.]]
+[[error_range][A character range was invalid, for example \[d-a\].]]
+[[error_space][Out of memory.]]
+[[error_badrepeat][An attempt to repeat something that can not be repeated - for example a*+]]
+[[error_complexity][The expression became too complex to handle.]]
+[[error_stack][Out of program stack space.]]
+[[error_bad_pattern][Other unspecified errors.]]
+]
+
+[endsect]
+
diff --git a/doc/examples.html b/doc/examples.html
deleted file mode 100644
index 737b11ee..00000000
--- a/doc/examples.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Examples</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Examples</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <BR>
-      <BR>
-      <HR>
-      <H3>Test Programs</H3>
-      <H4>regress:</H4>
-      <P>A regression test application that gives the matching/searching algorithms a 
-         full workout. The presence of this program is your guarantee that the library 
-         will behave as claimed - at least as far as those items tested are concerned - 
-         if anyone spots anything that isn't being tested I'd be glad to hear about it.</P>
-      <P>Directory: <A href="../test/regress">libs/regex/test/regress</A>.</P>
-      <P>Files: <A href="../test/regress/basic_tests.cpp">basic_tests.cpp</A> <A href="../test/regress/test_deprecated.cpp">
-            test_deprecated.cpp</A> <A href="../test/regress/main.cpp">main.cpp</A>.</P>
-      <H4>bad_expression_test:</H4>
-      <P>Verifies that "bad" regular expressions don't cause the matcher to go into 
-         infinite loops, but to throw an exception instead.</P>
-      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
-      <P>Files: <A href="../test/pathology/bad_expression_test.cpp">bad_expression_test.cpp</A>.</P>
-      <H4>recursion_test:</H4>
-      <P>Verifies that the matcher can't overrun the stack (no matter what the 
-         expression).</P>
-      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
-      <P>Files: <A href="../test/pathology/recursion_test.cpp">recursion_test.cpp</A>.</P>
-      <H4>concepts:</H4>
-      <P>Verifies that the library meets all documented concepts (a compile only test).</P>
-      <P>Directory: <A href="../test/concepts">libs/regex/test/concepts</A>.</P>
-      <P>Files: <A href="../test/concepts/concept_check.cpp">concept_check.cpp</A>.</P>
-      <H4>captures_test:</H4>
-      <P>Test code for captures.</P>
-      <P>Directory: <A href="../test/captures">libs/test/captures</A>.</P>
-      <P>Files: <A href="../test/captures/captures_test.cpp">captures_test.cpp</A>.</P>
-      <H3>Example programs</H3>
-      <H4>grep</H4>
-      <P>A simple grep implementation, run with the -h command line option to find out 
-         its usage.</P>
-      <P>Files: <A href="../example/grep/grep.cpp">grep.cpp</A></P>
-      <H4>timer.exe</H4>
-      <P>A simple interactive expression matching application, the results of all 
-         matches are timed, allowing the programmer to optimize their regular 
-         expressions where performance is critical.</P>
-      <P>Files: <A href="../example/timer/regex_timer.cpp">regex_timer.cpp</A>.</P>
-      <H4>Code snippets</H4>
-      <P>The snippets examples contain the code examples used in the documentation:</P>
-      <P><A href="../example/snippets/captures_example.cpp">captures_example.cpp</A>: 
-         Demonstrates the use of captures.</P>
-      <P><A href="../example/snippets/credit_card_example.cpp">credit_card_example.cpp</A>: 
-         Credit card number formatting code.</P>
-      <P><A href="../example/snippets/partial_regex_grep.cpp">partial_regex_grep.cpp</A>: 
-         Search example using partial matches.</P>
-      <P><A href="../example/snippets/partial_regex_match.cpp">partial_regex_match.cpp</A>: 
-         regex_match example using partial matches.</P>
-      <P><A href="../example/snippets/regex_iterator_example.cpp">regex_iterator_example.cpp</A>: 
-         Iterating through a series of matches.</P>
-      <P><A href="../example/snippets/regex_match_example.cpp">regex_match_example.cpp</A>: 
-         ftp based regex_match example.</P>
-      <P><A href="../example/snippets/regex_merge_example.cpp">regex_merge_example.cpp</A>: 
-         regex_merge example: converts a C++ file to syntax highlighted HTML.</P>
-      <P><A href="../example/snippets/regex_replace_example.cpp">regex_replace_example.cpp</A>: 
-         regex_replace example: converts a C++ file to syntax highlighted HTML</P>
-      <P><A href="../example/snippets/regex_search_example.cpp">regex_search_example.cpp</A>: 
-         regex_search example: searches a cpp file for class definitions.</P>
-      <P><A href="../example/snippets/regex_token_iterator_eg_1.cpp">regex_token_iterator_eg_1.cpp</A>: 
-         split a string into a series of tokens.</P>
-      <P><A href="../example/snippets/regex_token_iterator_eg_2.cpp">regex_token_iterator_eg_2.cpp</A>: 
-         enumerate the linked URL's in a HTML file.</P>
-      <P>The following are deprecated:</P>
-      <P><A href="../example/snippets/regex_grep_example_1.cpp">regex_grep_example_1.cpp</A>: 
-         regex_grep example 1: searches a cpp file for class definitions.</P>
-      <P><A href="../example/snippets/regex_grep_example_2.cpp">regex_grep_example_2.cpp</A>: 
-         regex_grep example 2: searches a cpp file for class definitions, using a global 
-         callback function.</P>
-      <P><A href="../example/snippets/regex_grep_example_3.cpp">regex_grep_example_3.cpp</A>: 
-         regex_grep example 2: searches a cpp file for class definitions, using a bound 
-         member function callback.</P>
-      <P><A href="../example/snippets/regex_grep_example_4.cpp">regex_grep_example_4.cpp</A>: 
-         regex_grep example 2: searches a cpp file for class definitions, using a C++ 
-         Builder closure as a callback.</P>
-      <P><A href="../example/snippets/regex_split_example_1.cpp">regex_split_example_1.cpp</A>: 
-         regex_split example: split a string into tokens.</P>
-      <P><A href="../example/snippets/regex_split_example_2.cpp">regex_split_example_2.cpp</A>
-         : regex_split example: spit out linked URL's.</P>
-      <P></P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/examples.qbk b/doc/examples.qbk
new file mode 100644
index 00000000..f3692954
--- /dev/null
+++ b/doc/examples.qbk
@@ -0,0 +1,115 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:examples Test and Example Programs]
+
+[h4 Test Programs]
+
+[*regress:]
+
+A regression test application that gives the matching/searching algorithms a 
+full workout. The presence of this program is your guarantee that the 
+library will behave as claimed - at least as far as those items tested 
+are concerned - if anyone spots anything that isn't being tested I'd be 
+glad to hear about it.
+
+Directory: [@../../test/regress libs/regex/test/regress].
+
+Files: See directory.
+
+[*bad_expression_test:]
+
+Verifies that "bad" regular expressions don't cause the matcher to go into 
+infinite loops, but to throw an exception instead.
+
+Directory: [@../../test/pathology libs/regex/test/pathology].
+
+Files: [@../../test/pathology/bad_expression_test.cpp bad_expression_test.cpp].
+
+[*recursion_test:]
+
+Verifies that the matcher can't overrun the stack (no matter what the expression).
+
+Directory: [@../../test/pathology libs/regex/test/pathology].
+
+Files: [@../../test/pathology/recursion_test.cpp recursion_test.cpp].
+
+[*concepts:]
+
+Verifies that the library meets all documented concepts (a compile only test).
+
+Directory: [@../../test/concepts libs/regex/test/concepts].
+
+Files: [@../../test/concepts/concept_check.cpp concept_check.cpp].
+
+[*captures_test:]
+
+Test code for captures.
+
+Directory: [@../../test/captures libs/test/captures].
+
+Files: [@../../test/captures/captures_test.cpp captures_test.cpp].
+
+[h4 Example programs]
+
+[*grep]
+
+A simple grep implementation, run with the -h command line option to find out its usage.
+
+Files: [@../../example/grep/grep.cpp grep.cpp]
+
+[*timer.exe]
+
+A simple interactive expression matching application, the results of all 
+matches are timed, allowing the programmer to optimize their regular expressions 
+where performance is critical.
+
+Files: [@../../example/timer/regex_timer.cpp regex_timer.cpp].
+
+[h4 Code snippets]
+
+The snippets examples contain the code examples used in the documentation:
+
+[@../../example/snippets/captures_example.cpp captures_example.cpp]: Demonstrates the use of captures.
+
+[@../../example/snippets/credit_card_example.cpp credit_card_example.cpp]: Credit card number formatting code.
+
+[@../../example/snippets/partial_regex_grep.cpp partial_regex_grep.cpp]: Search example using partial matches.
+
+[@../../example/snippets/partial_regex_match.cpp partial_regex_match.cpp]: regex_match example using partial matches.
+
+[@../../example/snippets/regex_iterator_example.cpp regex_iterator_example.cpp]: Iterating through a series of matches.
+
+[@../../example/snippets/regex_match_example.cpp regex_match_example.cpp]: ftp based regex_match example.
+
+[@../../example/snippets/regex_merge_example.cpp regex_merge_example.cpp]: regex_merge example: converts a C++ file to syntax highlighted HTML.
+
+[@../../example/snippets/regex_replace_example.cpp regex_replace_example.cpp]: regex_replace example: converts a C++ file to syntax highlighted HTML
+
+[@../../example/snippets/regex_search_example.cpp regex_search_example.cpp]: regex_search example: searches a cpp file for class definitions.
+
+[@../../example/snippets/regex_token_iterator_eg_1.cpp regex_token_iterator_eg_1.cpp]: split a string into a series of tokens.
+
+[@../../example/snippets/regex_token_iterator_eg_2.cpp regex_token_iterator_eg_2.cpp]: enumerate the linked URL's in a HTML file.
+
+The following are deprecated:
+
+[@../../example/snippets/regex_grep_example_1.cpp regex_grep_example_1.cpp]: regex_grep example 1: searches a cpp file for class definitions.
+
+[@../../example/snippets/regex_grep_example_2.cpp regex_grep_example_2.cpp]: regex_grep example 2: searches a cpp file for class definitions, using a global callback function.
+
+[@../../example/snippets/regex_grep_example_3.cpp regex_grep_example_3.cpp]: regex_grep example 2: searches a cpp file for class definitions, using a bound member function callback.
+
+[@../../example/snippets/regex_grep_example_4.cpp regex_grep_example_4.cpp]: regex_grep example 2: searches a cpp file for class definitions, using a C++ Builder closure as a callback.
+
+[@../../example/snippets/regex_split_example_1.cpp regex_split_example_1.cpp]: regex_split example: split a string into tokens.
+
+[@../../example/snippets/regex_split_example_2.cpp regex_split_example_2.cpp] : regex_split example: spit out linked URL's.
+
+[endsect]
+
diff --git a/doc/faq.html b/doc/faq.html
deleted file mode 100644
index e9557443..00000000
--- a/doc/faq.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: FAQ</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">FAQ</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <font color="#ff0000"><font color="#ff0000"></font></font>
-      <p><font color="#ff0000"><font color="#ff0000"><font color="#ff0000">&nbsp;Q. Why can't I 
-                  use the "convenience" versions of regex_match / regex_search / regex_grep / 
-                  regex_format / regex_merge?</font></font></font></p>
-      <p>A. These versions may or may not be available depending upon the capabilities 
-         of your compiler, the rules determining the format of these functions are quite 
-         complex - and only the versions visible to a standard compliant compiler are 
-         given in the help. To find out what your compiler supports, run 
-         &lt;boost/regex.hpp&gt; through your C++ pre-processor, and search the output 
-         file for the function that you are interested in.<font color="#ff0000"><font color="#ff0000"></font></font></p>
-      <p><font color="#ff0000"><font color="#ff0000">Q. I can't get regex++ to work with 
-               escape characters, what's going on?</font></font></p>
-      <p>A. If you embed regular expressions in C++ code, then remember that escape 
-         characters are processed twice: once by the C++ compiler, and once by the 
-         regex++ expression compiler, so to pass the regular expression \d+ to regex++, 
-         you need to embed "\\d+" in your code. Likewise to match a literal backslash 
-         you will need to embed "\\\\" in your code. <font color="#ff0000"></font>
-      </p>
-      <p><font color="#ff0000">Q. Why does using parenthesis in a POSIX regular expression 
-            change the result of a match?</font></p>
-      <p>For POSIX (extended and basic) regular expressions, but not for perl regexes, 
-         parentheses don't only mark; they determine what the best match is as well. 
-         When the expression is compiled as a POSIX basic or extended regex then 
-         Boost.regex follows the POSIX standard leftmost longest rule for determining 
-         what matched. So if there is more than one possible match after considering the 
-         whole expression, it looks next at the first sub-expression and then the second 
-         sub-expression and so on. So...</p>
-      <pre>
-"(0*)([0-9]*)" against "00123" would produce
-$1 = "00"
-$2 = "123"
-</pre>
-      <p>where as</p>
-      <pre>
-"0*([0-9])*" against "00123" would produce
-$1 = "00123"
-</pre>
-      <p>If you think about it, had $1 only matched the "123", this would be "less good" 
-         than the match "00123" which is both further to the left and longer. If you 
-         want $1 to match only the "123" part, then you need to use something like:</p>
-      <pre>
-"0*([1-9][0-9]*)"
-</pre>
-      <p>as the expression.</p>
-      <p><font color="#ff0000">Q. Why don't character ranges work properly (POSIX mode 
-            only)?</font><br>
-         A. The POSIX standard specifies that character range expressions are locale 
-         sensitive - so for example the expression [A-Z] will match any collating 
-         element that collates between 'A' and 'Z'. That means that for most locales 
-         other than "C" or "POSIX", [A-Z] would match the single character 't' for 
-         example, which is not what most people expect - or at least not what most 
-         people have come to expect from regular expression engines. For this reason, 
-         the default behaviour of boost.regex (perl mode) is to turn locale sensitive 
-         collation off by not setting the regex_constants::collate compile time flag. 
-         However if you set a non-default compile time flag - for example 
-         regex_constants::extended or regex_constants::basic, then locale dependent 
-         collation will be enabled, this also applies to the POSIX API functions which 
-         use either regex_constants::extended or regex_constants::basic internally. <i>[Note 
-            - when regex_constants::nocollate in effect, the library behaves "as if" the 
-            LC_COLLATE locale category were always "C", regardless of what its actually set 
-            to - end note</i>].</p>
-      <p><font color="#ff0000">Q. Why are there no throw specifications on any of the 
-            functions? What exceptions can the library throw?</font></p>
-      <p>A. Not all compilers support (or honor) throw specifications, others support 
-         them but with reduced efficiency. Throw specifications may be added at a later 
-         date as compilers begin to handle this better. The library should throw only 
-         three types of exception: boost::bad_expression can be thrown by basic_regex 
-         when compiling a regular expression, std::runtime_error can be thrown when a 
-         call to basic_regex::imbue tries to open a message catalogue that doesn't 
-         exist, or when a call to regex_search or regex_match results in an 
-         "everlasting" search,&nbsp;or when a call to RegEx::GrepFiles or 
-         RegEx::FindFiles tries to open a file that cannot be opened, finally 
-         std::bad_alloc can be thrown by just about any of the functions in this 
-         library.</p>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/faq.qbk b/doc/faq.qbk
new file mode 100644
index 00000000..585425fb
--- /dev/null
+++ b/doc/faq.qbk
@@ -0,0 +1,98 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:faq FAQ]
+
+[*Q.] I can't get regex++ to work with escape characters, what's going on?
+
+[*A.] If you embed regular expressions in C++ code, then remember that escape 
+characters are processed twice: once by the C++ compiler, and once by the 
+Boost.Regex expression compiler, so to pass the regular expression \d+ 
+to Boost.Regex, you need to embed "\\d+" in your code. Likewise to match a 
+literal backslash you will need to embed "\\\\" in your code.
+
+[*Q.] No matter what I do regex_match always returns false, what's going on?
+
+[*A.] The algorithm regex_match only succeeds if the expression matches *all*
+of the text, if you want to *find* a sub-string within the text that matches
+the expression then use regex_search instead.
+
+[*Q.] Why does using parenthesis in a POSIX regular expression change the 
+result of a match?
+
+[*A.] For POSIX (extended and basic) regular expressions, but not for perl regexes, 
+parentheses don't only mark; they determine what the best match is as well. 
+When the expression is compiled as a POSIX basic or extended regex then Boost.Regex 
+follows the POSIX standard leftmost longest rule for determining what matched. 
+So if there is more than one possible match after considering the whole expression, 
+it looks next at the first sub-expression and then the second sub-expression 
+and so on. So...
+
+"'''(0*)([0-9]*)'''" against "00123" would produce
+$1 = "00"
+$2 = "123"
+
+where as
+
+"0*([0-9])*" against "00123" would produce
+$1 = "00123"
+
+If you think about it, had $1 only matched the "123", this would be "less good" 
+than the match "00123" which is both further to the left and longer. If you 
+want $1 to match only the "123" part, then you need to use something like:
+
+"0*([1-9][0-9]*)"
+
+as the expression.
+
+[*Q.] Why don't character ranges work properly (POSIX mode only)?
+
+[*A.] The POSIX standard specifies that character range expressions are 
+locale sensitive - so for example the expression [A-Z] will match any 
+collating element that collates between 'A' and 'Z'. That means that for 
+most locales other than "C" or "POSIX", [A-Z] would match the single 
+character 't' for example, which is not what most people expect - or 
+at least not what most people have come to expect from regular 
+expression engines. For this reason, the default behaviour of Boost.Regex 
+(perl mode) is to turn locale sensitive collation off by not setting the 
+`regex_constants::collate` compile time flag. However if you set a non-default 
+compile time flag - for example `regex_constants::extended` or 
+`regex_constants::basic`, then locale dependent collation will be enabled, 
+this also applies to the POSIX API functions which use either 
+`regex_constants::extended` or `regex_constants::basic` internally. 
+[Note - when `regex_constants::nocollate` in effect, the library behaves 
+"as if" the LC_COLLATE locale category were always "C", regardless of what 
+its actually set to - end note].
+
+[*Q.] Why are there no throw specifications on any of the functions? 
+What exceptions can the library throw?
+
+[*A.] Not all compilers support (or honor) throw specifications, others 
+support them but with reduced efficiency. Throw specifications may be added 
+at a later date as compilers begin to handle this better. The library 
+should throw only three types of exception: [boost::regex_error] can be 
+thrown by [basic_regex] when compiling a regular expression, `std::runtime_error` 
+can be thrown when a call to `basic_regex::imbue` tries to open a message 
+catalogue that doesn't exist, or when a call to [regex_search] or [regex_match] 
+results in an "everlasting" search, or when a call to `RegEx::GrepFiles` or 
+`RegEx::FindFiles` tries to open a file that cannot be opened, finally 
+`std::bad_alloc` can be thrown by just about any of the functions in this library.
+
+[*Q.] Why can't I use the "convenience" versions of regex_match / 
+regex_search / regex_grep / regex_format / regex_merge?
+
+[*A.] These versions may or may not be available depending upon the 
+capabilities of your compiler, the rules determining the format of 
+these functions are quite complex - and only the versions visible to 
+a standard compliant compiler are given in the help. To find out 
+what your compiler supports, run <boost/regex.hpp> through your 
+C++ pre-processor, and search the output file for the function 
+that you are interested in.  Note however, that very few current
+compilers still have problems with these overloaded functions.
+
+[endsect]
+
diff --git a/doc/format_boost_syntax.html b/doc/format_boost_syntax.html
deleted file mode 100644
index d497ddeb..00000000
--- a/doc/format_boost_syntax.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Boost-Extended Format String Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Boost-Extended Format String Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Boost-Extended&nbsp;format strings treat all characters as literals except for 
-         '$', '\', '(', ')', '?', ':' and '\'.</P>
-      <H4>Grouping</H4>
-      <P>The characters '(' and ')' perform lexical grouping, use \( and \) if you want 
-         a to output literal parenthesis.</P>
-      <H4>Conditionals</H4>
-      <P>The character '?' begins a conditional expression, the general form is:</P>
-      <PRE>?Ntrue-expression:false-expression</PRE>
-      <P>where N is decimal digit.</P>
-      <P>If sub-expression <EM>N</EM> was matched, then true-expression is evaluated and 
-         sent to output, otherwise false-expression is evaluated and sent to output.</P>
-      <P>You will normally need to surround a conditional-expression with parenthesis in 
-         order to prevent ambiguities.</P>
-      <H4>Placeholder Sequences</H4>
-      <P>Placeholder sequences specify that some part of what matched the regular 
-         expression should be sent to output as follows:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Placeholder</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>$&amp;</TD>
-               <TD>Outputs what matched the whole expression.</TD>
-            </TR>
-            <TR>
-               <TD>$`</TD>
-               <TD>Outputs the text between the end of the last match found (or the start of the 
-                  text if no previous match was found), and the start of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$'</TD>
-               <TD>Outputs all the text following the end of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$$</TD>
-               <TD>Outputs a literal '$'</TD>
-            </TR>
-            <TR>
-               <TD>$n</TD>
-               <TD>Outputs what matched the n'th sub-expression.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Any $-placeholder sequence not listed above, results in '$' being treated as a 
-         literal.</P>
-      <H4>Escape Sequences</H4>
-      <P>An escape character followed by any character <EM>x</EM>, outputs that 
-         character unless <EM>x</EM> is one of the escape sequences shown below.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Escape</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>\a</TD>
-               <TD>Outputs the bell character: '\a'.</TD>
-            </TR>
-            <TR>
-               <TD>\e</TD>
-               <TD>Outputs the ANSI escape character (code point 27).</TD>
-            </TR>
-            <TR>
-               <TD>\f</TD>
-               <TD>Outputs a form feed character: '\f'</TD>
-            </TR>
-            <TR>
-               <TD>\n</TD>
-               <TD>Outputs a newline character: '\n'.</TD>
-            </TR>
-            <TR>
-               <TD>\r</TD>
-               <TD>Outputs a carriage return character: '\r'.</TD>
-            </TR>
-            <TR>
-               <TD>\t</TD>
-               <TD>Outputs a tab character: '\t'.</TD>
-            </TR>
-            <TR>
-               <TD>\v</TD>
-               <TD>Outputs a vertical tab character: '\v'.</TD>
-            </TR>
-            <TR>
-               <TD>\xDD</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDD</TD>
-            </TR>
-            <TR>
-               <TD>\x{DDDD}</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDDDDD</TD>
-            </TR>
-            <TR>
-               <TD>\cX</TD>
-               <TD>Outputs the ANSI escape sequence "escape-X".</TD>
-            </TR>
-            <TR>
-               <TD>\D</TD>
-               <TD>If <EM>D</EM> is a decimal digit in the range 1-9, then outputs the text that 
-                  matched sub-expression <EM>D</EM>.</TD>
-            </TR>
-            <TR>
-               <TD>\l</TD>
-               <TD>Causes the next character to be outputted, to be output in lower case.</TD>
-            </TR>
-            <TR>
-               <TD>\u</TD>
-               <TD>Causes the next character to be outputted, to be output in upper case.</TD>
-            </TR>
-            <TR>
-               <TD>\L</TD>
-               <TD>Causes all subsequent characters to be output in lower case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\U</TD>
-               <TD>Causes all subsequent characters to be output in upper case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\E</TD>
-               <TD>Terminates a \L or \U sequence.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/format_boost_syntax.qbk b/doc/format_boost_syntax.qbk
new file mode 100644
index 00000000..cba57dd8
--- /dev/null
+++ b/doc/format_boost_syntax.qbk
@@ -0,0 +1,81 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:boost_format_syntax Boost-Extended Format String Syntax]
+
+Boost-Extended format strings treat all characters as literals except for 
+'$', '\\', '(', ')', '?', and ':'.
+
+[h4 Grouping]
+
+The characters '(' and ')' perform lexical grouping, so use \\( and \\) if you 
+want a to output literal parenthesis.
+
+[h4 Conditionals]
+
+The character '?' begins a conditional expression, the general form is:
+
+?Ntrue-expression:false-expression
+
+where N is decimal digit.
+
+If sub-expression N was matched, then true-expression is evaluated and sent to 
+output, otherwise false-expression is evaluated and sent to output.
+
+You will normally need to surround a conditional-expression with parenthesis in 
+order to prevent ambiguities.
+
+For example, the format string "(?1foo:bar)" will replace each match found with "foo" if
+the sub-expression $1 was matched, and with "bar" otherwise.
+
+[h4 Placeholder Sequences]
+
+Placeholder sequences specify that some part of what matched the regular expression 
+should be sent to output as follows:
+
+[table
+[[Placeholder][Meaning]]
+[[$&][Outputs what matched the whole expression.]]
+[[$`][Outputs the text between the end of the last match found (or the 
+            start of the text if no previous match was found), and the start 
+            of the current match.]]
+[[$'][Outputs all the text following the end of the current match.]]
+[[$$][Outputs a literal '$']]
+[[$n][Outputs what matched the n'th sub-expression.]]
+]
+
+Any $-placeholder sequence not listed above, results in '$' being treated as a literal.
+
+[h4 Escape Sequences]
+
+An escape character followed by any character x, outputs that character unless 
+x is one of the escape sequences shown below.
+
+[table
+[[Escape][Meaning]]
+[[\\a][Outputs the bell character: '\\a'.]]
+[[\\e][Outputs the ANSI escape character (code point 27).]]
+[[\\f][Outputs a form feed character: '\\f']]
+[[\\n][Outputs a newline character: '\\n'.]]
+[[\\r][Outputs a carriage return character: '\\r'.]]
+[[\\t][Outputs a tab character: '\\t'.]]
+[[\\v][Outputs a vertical tab character: '\\v'.]]
+[[\\xDD][Outputs the character whose hexadecimal code point is 0xDD]]
+[[\\x{DDDD}][Outputs the character whose hexadecimal code point is 0xDDDDD]]
+[[\\cX][Outputs the ANSI escape sequence "escape-X".]]
+[[\\D][If D is a decimal digit in the range 1-9, then outputs the text that matched sub-expression D.]]
+[[\\l][Causes the next character to be outputted, to be output in lower case.]]
+[[\\u][Causes the next character to be outputted, to be output in upper case.]]
+[[\\L][Causes all subsequent characters to be output in lower case, until a \\E is found.]]
+[[\\U][Causes all subsequent characters to be output in upper case, until a \\E is found.]]
+[[\\E][Terminates a \\L or \\U sequence.]]
+]
+
+[endsect]
+
+
diff --git a/doc/format_perl_syntax.html b/doc/format_perl_syntax.html
deleted file mode 100644
index 481a141a..00000000
--- a/doc/format_perl_syntax.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Perl-Style Format String Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Perl-Style Format String Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Perl-style format strings treat all characters as literals except '$' and '\' 
-         which start placeholder and escape sequences respectively.</P>
-      <P>Placeholder sequences specify that some part of what matched the regular 
-         expression should be sent to output as follows:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Placeholder</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>$&amp;</TD>
-               <TD>Outputs what matched the whole expression.</TD>
-            </TR>
-            <TR>
-               <TD>$`</TD>
-               <TD>Outputs the text between the end of the last match found (or the start of the 
-                  text if no previous match was found), and the start of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$'</TD>
-               <TD>Outputs all the text following the end of the current match.</TD>
-            </TR>
-            <TR>
-               <TD>$$</TD>
-               <TD>Outputs a literal '$'</TD>
-            </TR>
-            <TR>
-               <TD>$n</TD>
-               <TD>Outputs what matched the n'th sub-expression.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Any $-placeholder sequence not listed above, results in '$' being treated as a 
-         literal.</P>
-      <P>An escape character followed by any character <EM>x</EM>, outputs that 
-         character unless <EM>x</EM> is one of the escape sequences shown below.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Escape</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>\a</TD>
-               <TD>Outputs the bell character: '\a'.</TD>
-            </TR>
-            <TR>
-               <TD>\e</TD>
-               <TD>Outputs the ANSI escape character (code point 27).</TD>
-            </TR>
-            <TR>
-               <TD>\f</TD>
-               <TD>Outputs a form feed character: '\f'</TD>
-            </TR>
-            <TR>
-               <TD>\n</TD>
-               <TD>Outputs a newline character: '\n'.</TD>
-            </TR>
-            <TR>
-               <TD>\r</TD>
-               <TD>Outputs a carriage return character: '\r'.</TD>
-            </TR>
-            <TR>
-               <TD>\t</TD>
-               <TD>Outputs a tab character: '\t'.</TD>
-            </TR>
-            <TR>
-               <TD>\v</TD>
-               <TD>Outputs a vertical tab character: '\v'.</TD>
-            </TR>
-            <TR>
-               <TD>\xDD</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDD</TD>
-            </TR>
-            <TR>
-               <TD>\x{DDDD}</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDDDDD</TD>
-            </TR>
-            <TR>
-               <TD>\cX</TD>
-               <TD>Outputs the ANSI escape sequence "escape-X".</TD>
-            </TR>
-            <TR>
-               <TD>\D</TD>
-               <TD>If <EM>D</EM> is a decimal digit in the range 1-9, then outputs the text that 
-                  matched sub-expression <EM>D</EM>.</TD>
-            </TR>
-            <TR>
-               <TD>\l</TD>
-               <TD>Causes the next character to be outputted, to be output in lower case.</TD>
-            </TR>
-            <TR>
-               <TD>\u</TD>
-               <TD>Causes the next character to be outputted, to be output in upper case.</TD>
-            </TR>
-            <TR>
-               <TD>\L</TD>
-               <TD>Causes all subsequent characters to be output in lower case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\U</TD>
-               <TD>Causes all subsequent characters to be output in upper case, until a \E is 
-                  found.</TD>
-            </TR>
-            <TR>
-               <TD>\E</TD>
-               <TD>Terminates a \L or \U sequence.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/format_perl_syntax.qbk b/doc/format_perl_syntax.qbk
new file mode 100644
index 00000000..35bd9f45
--- /dev/null
+++ b/doc/format_perl_syntax.qbk
@@ -0,0 +1,57 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:perl_format Perl Format String Syntax]
+
+Perl-style format strings treat all characters as literals except 
+'$' and '\\' which start placeholder and escape sequences respectively.
+
+Placeholder sequences specify that some part of what matched the regular expression 
+should be sent to output as follows:
+
+[table
+[[Placeholder][Meaning]]
+[[$&][Outputs what matched the whole expression.]]
+[[$`][Outputs the text between the end of the last match found (or the 
+      start of the text if no previous match was found), and the start 
+      of the current match.]]
+[[$'][Outputs all the text following the end of the current match.]]
+[[$$][Outputs a literal '$']]
+[[$n][Outputs what matched the n'th sub-expression.]]
+]
+
+Any $-placeholder sequence not listed above, results in '$' being treated 
+as a literal.
+
+An escape character followed by any character x, outputs that character unless 
+x is one of the escape sequences shown below.
+
+
+[table
+[[Escape][Meaning]]
+[[\\a][Outputs the bell character: '\\a'.]]
+[[\\e][Outputs the ANSI escape character (code point 27).]]
+[[\\f][Outputs a form feed character: '\\f']]
+[[\\n][Outputs a newline character: '\\n'.]]
+[[\\r][Outputs a carriage return character: '\\r'.]]
+[[\\t][Outputs a tab character: '\\t'.]]
+[[\\v][Outputs a vertical tab character: '\\v'.]]
+[[\\xDD][Outputs the character whose hexadecimal code point is 0xDD]]
+[[\\x{DDDD}][Outputs the character whose hexadecimal code point is 0xDDDDD]]
+[[\\cX][Outputs the ANSI escape sequence "escape-X".]]
+[[\\D][If D is a decimal digit in the range 1-9, then outputs the text that matched sub-expression D.]]
+[[\\l][Causes the next character to be outputted, to be output in lower case.]]
+[[\\u][Causes the next character to be outputted, to be output in upper case.]]
+[[\\L][Causes all subsequent characters to be output in lower case, until a \\E is found.]]
+[[\\U][Causes all subsequent characters to be output in upper case, until a \\E is found.]]
+[[\\E][Terminates a \\L or \\U sequence.]]
+]
+
+[endsect]
+
+
diff --git a/doc/format_sed_syntax.html b/doc/format_sed_syntax.html
deleted file mode 100644
index ee0a331b..00000000
--- a/doc/format_sed_syntax.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Sed-Style Format String Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Sed-Style Format String Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Sed-style format strings treat all characters as literals except:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="4" cellPadding="3" width="100%" border="0">
-            <TR>
-               <TD>&amp;</TD>
-               <TD>The ampersand character is replaced in the output stream by the the whole of 
-                  what matched the regular expression.&nbsp; Use \&amp; to output a literal 
-                  '&amp;' character.</TD>
-            </TR>
-            <TR>
-               <TD>\</TD>
-               <TD>Specifies an escape sequence.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-      <P>An escape character followed by any character <EM>x</EM>, outputs that 
-         character unless <EM>x</EM> is one of the escape sequences shown below.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="4" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Escape</STRONG></TD>
-               <TD><STRONG>Meaning</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>\a</TD>
-               <TD>Outputs the bell character: '\a'.</TD>
-            </TR>
-            <TR>
-               <TD>\e</TD>
-               <TD>Outputs the ANSI escape character (code point 27).</TD>
-            </TR>
-            <TR>
-               <TD>\f</TD>
-               <TD>Outputs a form feed character: '\f'</TD>
-            </TR>
-            <TR>
-               <TD>\n</TD>
-               <TD>Outputs a newline character: '\n'.</TD>
-            </TR>
-            <TR>
-               <TD>\r</TD>
-               <TD>Outputs a carriage return character: '\r'.</TD>
-            </TR>
-            <TR>
-               <TD>\t</TD>
-               <TD>Outputs a tab character: '\t'.</TD>
-            </TR>
-            <TR>
-               <TD>\v</TD>
-               <TD>Outputs a vertical tab character: '\v'.</TD>
-            </TR>
-            <TR>
-               <TD>\xDD</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDD</TD>
-            </TR>
-            <TR>
-               <TD>\x{DDDD}</TD>
-               <TD>Outputs the character whose hexadecimal code point is 0xDDDDD</TD>
-            </TR>
-            <TR>
-               <TD>\cX</TD>
-               <TD>Outputs the ANSI escape sequence "escape-X".</TD>
-            </TR>
-            <TR>
-               <TD>\D</TD>
-               <TD>If <EM>D</EM> is a decimal digit in the range 1-9, then outputs the text that 
-                  matched sub-expression <EM>D</EM>.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/format_sed_syntax.qbk b/doc/format_sed_syntax.qbk
new file mode 100644
index 00000000..30706ebe
--- /dev/null
+++ b/doc/format_sed_syntax.qbk
@@ -0,0 +1,41 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:sed_format Sed Format String Syntax]
+
+Sed-style format strings treat all characters as literals except:
+
+[table
+[[character][description]]
+[[&][The ampersand character is replaced in the output stream by 
+   the the whole of what matched the regular expression.  Use
+   \\& to output a literal '&' character.]]
+[[\\][Specifies an escape sequence.]]
+]
+
+An escape character followed by any character x, outputs that character unless x 
+is one of the escape sequences shown below.
+
+[table
+[[Escape][Meaning]]
+[[\\a][Outputs the bell character: '\\a'.]]
+[[\\e][Outputs the ANSI escape character (code point 27).]]
+[[\\f][Outputs a form feed character: '\\f']]
+[[\\n][Outputs a newline character: '\\n'.]]
+[[\\r][Outputs a carriage return character: '\\r'.]]
+[[\\t][Outputs a tab character: '\\t'.]]
+[[\\v][Outputs a vertical tab character: '\\v'.]]
+[[\\xDD][Outputs the character whose hexadecimal code point is 0xDD]]
+[[\\x{DDDD}][Outputs the character whose hexadecimal code point is 0xDDDDD]]
+[[\\cX][Outputs the ANSI escape sequence "escape-X".]]
+[[\\D][If D is a decimal digit in the range 1-9, then outputs the text that matched sub-expression D.]]
+]
+
+[endsect]
+
+
diff --git a/doc/format_syntax.html b/doc/format_syntax.html
deleted file mode 100644
index c7061d21..00000000
--- a/doc/format_syntax.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Format String Syntax</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Format String Syntax</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>Format strings are used by the algorithm <a href="regex_replace.html">regex_replace</a>&nbsp;and 
-         by <a href="match_results.html#m12">match_results::format</a>, and are used to 
-         transform one string into another.</p>
-      <p>
-         There are three kind of format string: Sed, Perl and Boost-extended.</p>
-      <P>Alternatively, when the flag <code>format_literal</code> is passed to one of these 
-         functions, then the format string is treated as a string literal, and is copied 
-         unchanged to the output.</P>
-      <P><A href="format_sed_syntax.html">Sed Style Format Strings</A><BR>
-         <A href="format_perl_syntax.html">Perl Style Format Strings</A><BR>
-         <A href="format_boost_syntax.html">Boost-Extended Format Strings</A></P>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/format_syntax.qbk b/doc/format_syntax.qbk
new file mode 100644
index 00000000..43065703
--- /dev/null
+++ b/doc/format_syntax.qbk
@@ -0,0 +1,26 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:format Search and Replace Format String Syntax]
+
+Format strings are used by the algorithm [regex_replace] and by 
+[match_results_format], and are used to transform one string into another.
+
+There are three kind of format string: [sed_format], [perl_format] and [boost_extended_format].
+
+Alternatively, when the flag `format_literal` is passed to one of these functions, 
+then the format string is treated as a string literal, and is copied unchanged 
+to the output.
+
+[include format_sed_syntax.qbk]
+[include format_perl_syntax.qbk]
+[include format_boost_syntax.qbk]
+
+[endsect]
+
+
diff --git a/doc/further_info.qbk b/doc/further_info.qbk
new file mode 100644
index 00000000..08c5d0ff
--- /dev/null
+++ b/doc/further_info.qbk
@@ -0,0 +1,36 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:futher References and Further Information]
+
+Short tutorials on regular expressions can be 
+[@http://etext.lib.virginia.edu/helpsheets/regex.html found here] and 
+[@http://www.linuxpcug.org/lessons/regexp.html here].
+
+The main book on regular expressions is 
+[@http://www.oreilly.com/catalog/regex/ Mastering Regular Expressions, published by O'Reilly].
+
+Boost.Regex forms the basis for the regular expression chapter of the [tr1].
+
+The [@http://www.opengroup.org/onlinepubs/7908799/toc.htm Open Unix Specification] 
+contains a wealth of useful material, 
+including the POSIX regular expression syntax.
+
+The [@http://www.cs.ucr.edu/~stelo/pattern.html Pattern Matching Pointers] 
+site is a "must visit" resource for anyone interested in pattern matching.
+
+[@http://glimpse.cs.arizona.edu/ Glimpse and Agrep], use a simplified 
+regular expression syntax to achieve faster search times.
+
+[@http://glimpse.cs.arizona.edu/udi.html Udi Manber] 
+and [@http://www.dcc.uchile.cl/~rbaeza/ Ricardo Baeza-Yates] both have a 
+selection of useful pattern matching papers available from their respective web sites.
+
+[endsect]
+
+
diff --git a/doc/gcc-performance.html b/doc/gcc-performance.html
deleted file mode 100644
index 5dcea95a..00000000
--- a/doc/gcc-performance.html
+++ /dev/null
@@ -1,543 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-   <head>
-      <title>Regular Expression Performance Comparison (gcc 3.2)</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-      <META content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot" name="Template">
-      <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
-   </head>
-   <body bgcolor="#ffffff" link="#0000ff" vlink="#800080">
-      <h2>Regular Expression Performance Comparison</h2>
-      <p>The following tables provide comparisons between the following regular 
-         expression libraries:</p>
-      <p><a href="http://www.boost.org/">The Boost regex library</a>.</p>
-      <p><a href="http://www.gnu.org">The GNU regular expression library</a>.</p>
-      <p>Philip Hazel's <a href="http://www.pcre.org">PCRE</a> library.</p>
-      <h3>Details</h3>
-      <p>Machine: Intel Pentium 4 2.8GHz PC.</p>
-      <p>Compiler: GNU C++ version 3.2 20020927 (prerelease).</p>
-      <p>C++ Standard Library: GNU libstdc++ version 20020927.</p>
-      <p>OS: Cygwin.</p>
-      <p>Boost version: 1.31.0.</p>
-      <p>PCRE version: 4.1.</p>
-      <p>As ever care should be taken in interpreting the results, only sensible regular 
-         expressions (rather than pathological cases) are given, most are taken from the 
-         Boost regex examples, or from the <a href="http://www.regxlib.com/">Library of 
-            Regular Expressions</a>. In addition, some variation in the relative 
-         performance of these libraries can be expected on other machines - as memory 
-         access and processor caching effects can be quite large for most finite state 
-         machine algorithms. In each case the first figure given is the relative time 
-         taken (so a value of 1.0 is as good as it gets), while the second figure is the 
-         actual time taken.</p>
-      <h3>Averages</h3>
-      <p>The following are the average relative scores for all the tests: the perfect 
-         regular expression library&nbsp;would score 1, in practice anything less than 2 
-         is pretty good.</p>
-      <table border="1" cellspacing="1">
-         <tr>
-            <td><strong>Boost</strong></td>
-            <td><strong>Boost + C++ locale</strong></td>
-            <td><strong>POSIX</strong></td>
-            <td><strong>PCRE</strong></td>
-         </tr>
-         <tr>
-            <td>1.4503</td>
-            <td>1.49124</td>
-            <td>108.372</td>
-            <td>1.56255</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3>Comparison 1: Long Search</h3>
-      <p>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within a long English language text was measured 
-         (<a href="http://www.gutenberg.org/files/3200/old/mtent12.zip">mtent12.txt</a>
-         from <a href="http://promo.net/pg/">Project Gutenberg</a>, 19Mb).&nbsp;</p>
-      <table border="1" cellspacing="1">
-         <tr>
-            <td><strong>Expression</strong></td>
-            <td><strong>Boost</strong></td>
-            <td><strong>Boost + C++ locale</strong></td>
-            <td><strong>POSIX</strong></td>
-            <td><strong>PCRE</strong></td>
-         </tr>
-         <tr>
-            <td><code>Twain</code></td>
-            <td>3.49<br>
-               (0.205s)</td>
-            <td>4.09<br>
-               (0.24s)</td>
-            <td>65.2<br>
-               (3.83s)</td>
-            <td><font color="#008000">1<br>
-                  (0.0588s)</font></td>
-         </tr>
-         <tr>
-            <td><code>Huck[[:alpha:]]+</code></td>
-            <td>3.86<br>
-               (0.203s)</td>
-            <td>4.52<br>
-               (0.238s)</td>
-            <td>100<br>
-               (5.26s)</td>
-            <td><font color="#008000">1<br>
-                  (0.0526s)</font></td>
-         </tr>
-         <tr>
-            <td><code>[[:alpha:]]+ing</code></td>
-            <td><font color="#008000">1.01<br>
-                  (1.23s)</font></td>
-            <td><font color="#008000">1<br>
-                  (1.22s)</font></td>
-            <td>4.95<br>
-               (6.04s)</td>
-            <td>4.67<br>
-               (5.71s)</td>
-         </tr>
-         <tr>
-            <td><code>^[^ ]*?Twain</code></td>
-            <td><font color="#008000">1<br>
-                  (0.31s)</font></td>
-            <td><font color="#008000">1.05<br>
-                  (0.326s)</font></td>
-            <td>NA</td>
-            <td>3.32<br>
-               (1.03s)</td>
-         </tr>
-         <tr>
-            <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
-            <td><font color="#008000">1.02<br>
-                  (0.125s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.123s)</font></td>
-            <td>165<br>
-               (20.3s)</td>
-            <td><font color="#008000">1.08<br>
-                  (0.133s)</font></td>
-         </tr>
-         <tr>
-            <td><code> (Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
-            <td><font color="#008000">1<br>
-                  (0.345s)</font></td>
-            <td><font color="#008000">1.03<br>
-                  (0.355s)</font></td>
-            <td>NA</td>
-            <td>1.71<br>
-               (0.59s)</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3>Comparison 2: Medium Sized Search</h3>
-      <p>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within a medium sized English language text was 
-         measured (the first 50K from mtent12.txt).&nbsp;</p>
-      <table border="1" cellspacing="1">
-         <tr>
-            <td><strong>Expression</strong></td>
-            <td><strong>Boost</strong></td>
-            <td><strong>Boost + C++ locale</strong></td>
-            <td><strong>POSIX</strong></td>
-            <td><strong>PCRE</strong></td>
-         </tr>
-         <tr>
-            <td><code>Twain</code></td>
-            <td>1.8<br>
-               (0.000519s)</td>
-            <td>2.14<br>
-               (0.000616s)</td>
-            <td>9.08<br>
-               (0.00262s)</td>
-            <td><font color="#008000">1<br>
-                  (0.000289s)</font></td>
-         </tr>
-         <tr>
-            <td><code>Huck[[:alpha:]]+</code></td>
-            <td>3.65<br>
-               (0.000499s)</td>
-            <td>4.36<br>
-               (0.000597s)</td>
-            <td><font color="#008000">1<br>
-                  (0.000137s)</font></td>
-            <td>1.43<br>
-               (0.000196s)</td>
-         </tr>
-         <tr>
-            <td><code>[[:alpha:]]+ing</code></td>
-            <td><font color="#008000">1<br>
-                  (0.00258s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.00258s)</font></td>
-            <td>5.28<br>
-               (0.0136s)</td>
-            <td>5.63<br>
-               (0.0145s)</td>
-         </tr>
-         <tr>
-            <td><code>^[^ ]*?Twain</code></td>
-            <td><font color="#008000">1<br>
-                  (0.000929s)</font></td>
-            <td><font color="#008000">1.03<br>
-                  (0.000957s)</font></td>
-            <td>NA</td>
-            <td>2.82<br>
-               (0.00262s)</td>
-         </tr>
-         <tr>
-            <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
-            <td><font color="#008000">1<br>
-                  (0.000812s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.000812s)</font></td>
-            <td>60.1<br>
-               (0.0488s)</td>
-            <td>1.28<br>
-               (0.00104s)</td>
-         </tr>
-         <tr>
-            <td><code> (Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
-            <td><font color="#008000">1.02<br>
-                  (0.00178s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.00174s)</font></td>
-            <td>242<br>
-               (0.421s)</td>
-            <td>1.3<br>
-               (0.00227s)</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3>Comparison 3:&nbsp;C++ Code&nbsp;Search</h3>
-      <p>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within the C++ source file <a href="../../../boost/crc.hpp">
-            boost/crc.hpp</a>&nbsp;was measured.&nbsp;</p>
-      <table border="1" cellspacing="1">
-         <tr>
-            <td><strong>Expression</strong></td>
-            <td><strong>Boost</strong></td>
-            <td><strong>Boost + C++ locale</strong></td>
-            <td><strong>POSIX</strong></td>
-            <td><strong>PCRE</strong></td>
-         </tr>
-         <tr>
-            <td><code> ^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?(class|struct)[[:space:]]*(\&lt;\w+\&gt;([ 
-                  ]*\([^)]*\))?[[:space:]]*)*(\&lt;\w*\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?(\{|:[^;\{()]*\{)</code></td>
-            <td><font color="#008000">1.04<br>
-                  (0.000144s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.000139s)</font></td>
-            <td>862<br>
-               (0.12s)</td>
-            <td>4.56<br>
-               (0.000636s)</td>
-         </tr>
-         <tr>
-            <td><code>(^[ 
-                  ]*#(?:[^\\\n]|\\[^\n_[:punct:][:alnum:]]*[\n[:punct:][:word:]])*)|(//[^\n]*|/\*.*?\*/)|\&lt;([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\.)?[[:digit:]]+(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\&gt;|('(?:[^\\']|\\.)*'|"(?:[^\\"]|\\.)*")|\&lt;(__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|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\&gt;</code></td>
-            <td><font color="#008000">1<br>
-                  (0.0139s)</font></td>
-            <td><font color="#008000">1.01<br>
-                  (0.0141s)</font></td>
-            <td>NA</td>
-            <td>1.55<br>
-               (0.0216s)</td>
-         </tr>
-         <tr>
-            <td><code>^[ ]*#[ ]*include[ ]+("[^"]+"|&lt;[^&gt;]+&gt;)</code></td>
-            <td><font color="#008000">1.04<br>
-                  (0.000332s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.000318s)</font></td>
-            <td>130<br>
-               (0.0413s)</td>
-            <td>1.72<br>
-               (0.000547s)</td>
-         </tr>
-         <tr>
-            <td><code>^[ ]*#[ ]*include[ ]+("boost/[^"]+"|&lt;boost/[^&gt;]+&gt;)</code></td>
-            <td><font color="#008000">1.02<br>
-                  (0.000323s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.000318s)</font></td>
-            <td>150<br>
-               (0.0476s)</td>
-            <td>1.72<br>
-               (0.000547s)</td>
-         </tr>
-      </table>
-      <br>
-      <h3></h3>
-      <H3>Comparison 4: HTML Document Search
-      </H3>
-      <p>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within the html file <a href="../../libraries.htm">libs/libraries.htm</a>
-         was measured.&nbsp;</p>
-      <table border="1" cellspacing="1">
-         <tr>
-            <td><strong>Expression</strong></td>
-            <td><strong>Boost</strong></td>
-            <td><strong>Boost + C++ locale</strong></td>
-            <td><strong>POSIX</strong></td>
-            <td><strong>PCRE</strong></td>
-         </tr>
-         <tr>
-            <td><code>beman|john|dave</code></td>
-            <td><font color="#008000">1.03<br>
-                  (0.000367s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.000357s)</font></td>
-            <td>47.4<br>
-               (0.0169s)</td>
-            <td>1.16<br>
-               (0.000416s)</td>
-         </tr>
-         <tr>
-            <td><code>&lt;p&gt;.*?&lt;/p&gt;</code></td>
-            <td>1.25<br>
-               (0.000459s)</td>
-            <td><font color="#008000">1<br>
-                  (0.000367s)</font></td>
-            <td>NA</td>
-            <td><font color="#008000">1.03<br>
-                  (0.000376s)</font></td>
-         </tr>
-         <tr>
-            <td><code> &lt;a[^&gt;]+href=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
-            <td><font color="#008000">1<br>
-                  (0.000509s)</font></td>
-            <td><font color="#008000">1.02<br>
-                  (0.000518s)</font></td>
-            <td>305<br>
-               (0.155s)</td>
-            <td><font color="#008000">1.1<br>
-                  (0.000558s)</font></td>
-         </tr>
-         <tr>
-            <td><code> &lt;h[12345678][^&gt;]*&gt;.*?&lt;/h[12345678]&gt;</code></td>
-            <td><font color="#008000">1.04<br>
-                  (0.00025s)</font></td>
-            <td><font color="#008000">1<br>
-                  (0.00024s)</font></td>
-            <td>NA</td>
-            <td>1.16<br>
-               (0.000279s)</td>
-         </tr>
-         <tr>
-            <td><code> &lt;img[^&gt;]+src=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
-            <td>2.22<br>
-               (0.000489s)</td>
-            <td>1.69<br>
-               (0.000372s)</td>
-            <td>148<br>
-               (0.0326s)</td>
-            <td><font color="#008000">1<br>
-                  (0.00022s)</font></td>
-         </tr>
-         <tr>
-            <td><code> &lt;font[^&gt;]+face=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;.*?&lt;/font&gt;</code></td>
-            <td>1.71<br>
-               (0.000371s)</td>
-            <td>1.75<br>
-               (0.000381s)</td>
-            <td>NA</td>
-            <td><font color="#008000">1<br>
-                  (0.000218s)</font></td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <h3>Comparison 3: Simple Matches</h3>
-      <p>For each of the following regular expressions the time taken to match against 
-         the text indicated was measured.&nbsp;</p>
-      <table border="1" cellspacing="1">
-         <tr>
-            <td><strong>Expression</strong></td>
-            <td><strong>Text</strong></td>
-            <td><strong>Boost</strong></td>
-            <td><strong>Boost + C++ locale</strong></td>
-            <td><strong>POSIX</strong></td>
-            <td><strong>PCRE</strong></td>
-         </tr>
-         <tr>
-            <td><code>abc</code></td>
-            <td>abc</td>
-            <td>1.36<br>
-               (2.15e-07s)</td>
-            <td>1.36<br>
-               (2.15e-07s)</td>
-            <td>2.76<br>
-               (4.34e-07s)</td>
-            <td><font color="#008000">1<br>
-                  (1.58e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code>^([0-9]+)(\-| |$)(.*)$</code></td>
-            <td>100- this is a line of ftp response which contains a message string</td>
-            <td>1.55<br>
-               (7.26e-07s)</td>
-            <td>1.51<br>
-               (7.07e-07s)</td>
-            <td>319<br>
-               (0.000149s)</td>
-            <td><font color="#008000">1<br>
-                  (4.67e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code>([[:digit:]]{4}[- ]){3}[[:digit:]]{3,4}</code></td>
-            <td>1234-5678-1234-456</td>
-            <td>1.96<br>
-               (9.54e-07s)</td>
-            <td>1.96<br>
-               (9.54e-07s)</td>
-            <td>44.5<br>
-               (2.17e-05s)</td>
-            <td><font color="#008000">1<br>
-                  (4.87e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code> ^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
-            <td>john@johnmaddock.co.uk</td>
-            <td>1.22<br>
-               (1.51e-06s)</td>
-            <td>1.23<br>
-               (1.53e-06s)</td>
-            <td>162<br>
-               (0.000201s)</td>
-            <td><font color="#008000">1<br>
-                  (1.24e-06s)</font></td>
-         </tr>
-         <tr>
-            <td><code> ^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
-            <td>foo12@foo.edu</td>
-            <td>1.28<br>
-               (1.47e-06s)</td>
-            <td>1.3<br>
-               (1.49e-06s)</td>
-            <td>104<br>
-               (0.00012s)</td>
-            <td><font color="#008000">1<br>
-                  (1.15e-06s)</font></td>
-         </tr>
-         <tr>
-            <td><code> ^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
-            <td>bob.smith@foo.tv</td>
-            <td>1.28<br>
-               (1.47e-06s)</td>
-            <td>1.3<br>
-               (1.49e-06s)</td>
-            <td>113<br>
-               (0.00013s)</td>
-            <td><font color="#008000">1<br>
-                  (1.15e-06s)</font></td>
-         </tr>
-         <tr>
-            <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
-            <td>EH10 2QQ</td>
-            <td>1.38<br>
-               (4.68e-07s)</td>
-            <td>1.41<br>
-               (4.77e-07s)</td>
-            <td>13.5<br>
-               (4.59e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (3.39e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
-            <td>G1 1AA</td>
-            <td>1.28<br>
-               (4.35e-07s)</td>
-            <td>1.25<br>
-               (4.25e-07s)</td>
-            <td>11.7<br>
-               (3.97e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (3.39e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
-            <td>SW1 1ZZ</td>
-            <td>1.32<br>
-               (4.53e-07s)</td>
-            <td>1.31<br>
-               (4.49e-07s)</td>
-            <td>12.2<br>
-               (4.2e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (3.44e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code> ^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
-            <td>4/1/2001</td>
-            <td>1.16<br>
-               (3.82e-07s)</td>
-            <td>1.2<br>
-               (3.96e-07s)</td>
-            <td>13.9<br>
-               (4.59e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (3.29e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code> ^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
-            <td>12/12/2001</td>
-            <td>1.38<br>
-               (4.49e-07s)</td>
-            <td>1.38<br>
-               (4.49e-07s)</td>
-            <td>16<br>
-               (5.2e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (3.25e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
-            <td>123</td>
-            <td>1.19<br>
-               (7.64e-07s)</td>
-            <td>1.16<br>
-               (7.45e-07s)</td>
-            <td>7.51<br>
-               (4.81e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (6.4e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
-            <td>+3.14159</td>
-            <td>1.32<br>
-               (8.97e-07s)</td>
-            <td>1.31<br>
-               (8.88e-07s)</td>
-            <td>14<br>
-               (9.48e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (6.78e-07s)</font></td>
-         </tr>
-         <tr>
-            <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
-            <td>-3.14159</td>
-            <td>1.32<br>
-               (8.97e-07s)</td>
-            <td>1.31<br>
-               (8.88e-07s)</td>
-            <td>14<br>
-               (9.48e-06s)</td>
-            <td><font color="#008000">1<br>
-                  (6.78e-07s)</font></td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p><i>© Copyright John Maddock&nbsp;2003</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/headers.html b/doc/headers.html
deleted file mode 100644
index 031d33fe..00000000
--- a/doc/headers.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Headers</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Headers</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>There are two main headers used by this library: &lt;boost/regex.hpp&gt; 
-         provides full access to the main template library, while 
-         &lt;boost/cregex.hpp&gt; provides access to the (deprecated) high level class 
-         RegEx, and the POSIX API functions.
-      </P>
-      <P>There is also a header containing only forward declarations 
-         &lt;boost/regex_fwd.hpp&gt; for use when an interface is dependent upon 
-         boost::basic_regex, but otherwise does not need the full definitions.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/headers.qbk b/doc/headers.qbk
new file mode 100644
index 00000000..d7b8e7cc
--- /dev/null
+++ b/doc/headers.qbk
@@ -0,0 +1,22 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:headers Headers]
+
+There are two main headers used by this library: `<boost/regex.hpp>` 
+provides full access to the main template library, while `<boost/cregex.hpp>` 
+provides access to the (deprecated) high level class RegEx, and the 
+POSIX API functions.
+
+There is also a header containing only forward declarations 
+`<boost/regex_fwd.hpp>` for use when an interface is dependent upon 
+[basic_regex], but otherwise does not need the full definitions.
+
+[endsect]
+
+
diff --git a/doc/history.html b/doc/history.html
deleted file mode 100644
index 72a50f03..00000000
--- a/doc/history.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: History</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">History</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Boost 1.34</P>
-      <UL>
-         <LI>
-         Fix for non-greedy repeats and partial matches not working correctly in some 
-         cases.
-         <LI>
-         Fix for non-greedy repeats on VC++ not working in some cases (bug report 
-         1515830).
-         <LI>
-            Changed match_results::position() to return a valid result when *this 
-            represents a partial match.</LI>
-      </UL>
-      <P>Boost 1.33.1</P>
-      <UL>
-         <LI>
-         Fixed broken makefiles.
-         <LI>
-         Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when 
-         using /Zc:wchar_t.
-         <LI>
-         Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler 
-         can cope.
-         <LI>
-         Added needed standard library #includes to fileiter.hpp, regex_workaround.hpp 
-         and cpp_regex_traits.hpp.
-         <LI>
-         Fixed a bug where non-greedy repeats could in certain strange curcumstances 
-         repeat more times than their maximum value.
-         <LI>
-         Fixed the value returned by basic_regex&lt;&gt;::empty() from a default 
-         constructed object.
-         <LI>
-         Changed the deffinition of regex_error to make it backwards compatible with 
-         Boost-1.32.0.
-         <LI>
-         Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
-         unresolved references can occur.
-         <LI>
-         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.
-         <LI>
-         Initialise all the data members of the unicode_iterators: this keeps gcc from 
-         issuing needless warnings.
-         <LI>
-         Ported the ICU integration code to VC6 and VC7.
-         <LI>
-         Ensured code is STLport debug mode clean.
-         <LI>
-         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).
-         <LI>
-         Fixed strange bug with non-greedy repeats inside forward lookahead assertions.
-         <LI>
-         Enabled negated character classes inside character sets.
-         <LI>
-         Fixed regression so that [a-z-] is a valid expression again.
-         <LI>
-            Fixed bug that allowed some invalid expressions to be accepted.</LI></UL>
-      <P>Boost 1.33.0.</P>
-      <UL>
-         <LI>
-         Completely rewritten expression parsing code, and traits class support; now 
-         conforms to the standardization proposal.
-         <LI>
-            <STRONG>Breaking Change:</STRONG> The <A href="syntax_option_type.html">syntax 
-               options</A> that can be passed to <A href="basic_regex.html">basic_regex 
-               constructors</A> have been rationalized.&nbsp; The default option (perl) now 
-            has a value of zero, and it is now clearly documented which options apply to 
-            which <A href="syntax.html">regular expression syntax styles (perl, 
-               POSIX-extended, POSIX-basic etc)</A>.&nbsp; Some of the more esoteric 
-         options have now been removed, so there is the possibility that existing code 
-         may fail to compile: however equivalent functionality should still be 
-         available.
-         <LI>
-            <STRONG>Breaking Change: </STRONG>
-         POSIX-extended and POSIX-basic regular expressions now enforce the letter of 
-         the POSIX standard much more closely than before.
-         <LI>
-            Added <A href="syntax_perl.html#Perl">support for (?imsx-imsx) constructs</A>.
-         <LI>
-            Added <A href="syntax_perl.html#Perl">support for lookbehind expressions 
-               (?&lt;=positive-lookbehind) and (?&lt;!negative-lookbehind)</A>.
-         <LI>
-            Added <A href="syntax_perl.html#Perl">support for conditional expressions 
-               (?(assertion)true-expresion|false-expression)</A>.
-         <LI>
-            Added <A href="mfc_strings.html">MFC/ATL string wrappers</A>.
-         <LI>
-            Added <A href="unicode.html">Unicode support; based on ICU</A>.
-         <LI>
-         Changed newline support to recognise \f as a line separator (all character 
-         types), and \x85 as a line separator for wide characters / Unicode only.
-         <LI>
-            Added a new format flag <A href="match_flag_type.html"><code>format_literal</code></A>
-            that treats the replace string as a literal, rather than a Perl or Sed style <A href="format_syntax.html">
-               format string</A>.
-         <LI>
-            Errors are now reported by throwing exceptions of type <A href="bad_expression.html">
-               <code>regex_error</code></A>. The types used previously - <code>bad_expression</code>
-            and <code>bad_pattern</code> - are now just typedefs for <code>regex_error</code>. 
-            Type <code>regex_error</code> has a couple of new members: <code>code()</code> to 
-            report an error code rather than a string, and <code>position()</code> to 
-            report where in the expression the error occured.</LI></UL>
-      <P>Boost 1.32.1.</P>
-      <UL>
-         <LI>
-            Fixed bug in partial matches of bounded repeats of '.'.</LI></UL>
-      <P>Boost 1.31.0.</P>
-      <UL>
-         <LI>
-         Completely rewritten pattern matching code - it is now up to 10 times faster 
-         than before.
-         <LI>
-         Reorganized documentation.
-         <LI>
-            Deprecated all interfaces that are not part of the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-               regular expression standardization proposal</A>.
-         <LI>
-            Added <A href="regex_iterator.html">regex_iterator</A> and <A href="regex_token_iterator.html">
-               regex_token_iterator</A>
-         .
-         <LI>
-         Added support for Perl style independent sub-expressions.
-         <LI>
-            Added non-member operators to the<A href="sub_match.html"> sub_match class</A>, 
-         so that you can compare sub_match's with strings, or add them to a string to 
-         produce a new string.
-         <LI>
-            Added experimental support for <A href="captures.html">extended capture 
-               information</A>.
-         <LI>
-            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<A href="match_flag_type.html">
-               match_flag_type</A> to the regex algorithms then you will now get a compiler 
-            error.</LI></UL>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/history.qbk b/doc/history.qbk
new file mode 100644
index 00000000..fea29663
--- /dev/null
+++ b/doc/history.qbk
@@ -0,0 +1,69 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:history History]
+
+[h4 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 |.
+
+[h4 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.
+
+[h4 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 to which regular expression syntax styles (perl, POSIX-extended, POSIX-basic etc).  Some of the more esoteric options have now been removed, so there 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: code() to report an error code rather than a string, and position() to report where in the expression the error occured.
+
+[h4 Boost 1.32.1]
+
+* Fixed bug in partial matches of bounded repeats of '.'.
+
+[h4 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.
+    
+[endsect]
+
+
diff --git a/doc/html/boost_regex/background_information.html b/doc/html/boost_regex/background_information.html
new file mode 100644
index 00000000..45d793e6
--- /dev/null
+++ b/doc/html/boost_regex/background_information.html
@@ -0,0 +1,78 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Background Information</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="ref/deprecated_interfaces/old_regex.html" title=" High
+        Level Class RegEx (Deprecated)">
+<link rel="next" href="background_information/headers.html" title=" Headers">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="ref/deprecated_interfaces/old_regex.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="background_information/headers.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.background_information"></a><a href="background_information.html" title="Background Information">Background Information</a></h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="background_information/headers.html"> Headers</a></span></dt>
+<dt><span class="section"><a href="background_information/locale.html"> Localization</a></span></dt>
+<dt><span class="section"><a href="background_information/thread_safety.html"> Thread
+      Safety</a></span></dt>
+<dt><span class="section"><a href="background_information/examples.html"> Test and
+      Example Programs</a></span></dt>
+<dt><span class="section"><a href="background_information/futher.html"> References
+      and Further Information</a></span></dt>
+<dt><span class="section"><a href="background_information/faq.html"> FAQ</a></span></dt>
+<dt><span class="section"><a href="background_information/performance.html"> Performance</a></span></dt>
+<dt><span class="section"><a href="background_information/standards.html"> Standards
+      Conformance</a></span></dt>
+<dt><span class="section"><a href="background_information/redist.html"> Redistributables</a></span></dt>
+<dt><span class="section"><a href="background_information/acknowledgements.html">
+      Acknowledgements</a></span></dt>
+<dt><span class="section"><a href="background_information/history.html"> History</a></span></dt>
+</dl></div>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="ref/deprecated_interfaces/old_regex.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="background_information/headers.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/acknowledgements.html b/doc/html/boost_regex/background_information/acknowledgements.html
new file mode 100644
index 00000000..0e9a5827
--- /dev/null
+++ b/doc/html/boost_regex/background_information/acknowledgements.html
@@ -0,0 +1,88 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+      Acknowledgements</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="redist.html" title=" Redistributables">
+<link rel="next" href="history.html" title=" History">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="redist.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="history.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.acknowledgements"></a><a href="acknowledgements.html" title="
+      Acknowledgements">
+      Acknowledgements</a></h3></div></div></div>
+<p>
+        The author can be contacted at john - at - johnmaddock.co.uk; the home page
+        for this library is at <a href="http://www.boost.org" target="_top">www.boost.org</a>.
+      </p>
+<p>
+        I am indebted to <a href="http://www.cs.princeton.edu/~rs/" target="_top">Robert Sedgewick's
+        "Algorithms in C++"</a> for forcing me to think about algorithms
+        and their performance, and to the folks at boost for forcing me to think,
+        period.
+      </p>
+<p>
+        <a href="http://www.boost-consulting.com/" target="_top">Eric Niebler</a>, author
+        of Boost.Expressive and the <a href="http://research.microsoft.com/projects/greta" target="_top">GRETA
+        regular expression component</a>, has shared several important ideas,
+        in a series of long discussions.
+      </p>
+<p>
+        Pete Becker, of <a href="http://www.versatilecoding.com" target="_top">Roundhouse Consulting,
+        Ltd.</a>, has helped enormously with the standardisation proposal language.
+      </p>
+<p>
+        The following people have all contributed useful comments or fixes: Dave
+        Abrahams, Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan Bölsche,
+        Beman Dawes, Paul Baxter, David Bergman, David Dennerline, Edward Diener,
+        Peter Dimov, Robert Dunn, Fabio Forno, Tobias Gabrielsson, Rob Gillen, Marc
+        Gregoire, Chris Hecker, Nick Hodapp, Jesse Jones, Martin Jost, Boris Krasnovskiy,
+        Jan Hermelink, Max Leung, Wei-hao Lin, Jens Maurer, Richard Peters, Heiko
+        Schmidt, Jason Shirk, Gerald Slacik, Scobie Smith, Mike Smyth, Alexander
+        Sokolovsky, Hervé Poirier, Michael Raykh, Marc Recht, Scott VanCamp, Bruno
+        Voigt, Alexey Voinov, Jerry Waldorf, Rob Ward, Lealon Watts, John Wismar,
+        Thomas Witt and Yuval Yosef.
+      </p>
+<p>
+        If I've missed your name off (I'm sure there are a few, just not who they
+        are...) then please do get in touch.
+      </p>
+<p>
+        I am also grateful to the manuals supplied with the Henry Spencer, PCRE,
+        Perl and GNU regular expression libraries - wherever possible I have tried
+        to maintain compatibility with these libraries and with the POSIX standard
+        - the code however is entirely my own, including any bugs! I can absolutely
+        guarantee that I will not fix any bugs I don't know about, so if you have
+        any comments or spot any bugs, please get in touch.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="redist.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="history.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/examples.html b/doc/html/boost_regex/background_information/examples.html
new file mode 100644
index 00000000..7c929efe
--- /dev/null
+++ b/doc/html/boost_regex/background_information/examples.html
@@ -0,0 +1,224 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Test and
+      Example Programs</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="thread_safety.html" title=" Thread
+      Safety">
+<link rel="next" href="futher.html" title=" References
+      and Further Information">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="thread_safety.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="futher.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.examples"></a><a href="examples.html" title=" Test and
+      Example Programs"> Test and
+      Example Programs</a></h3></div></div></div>
+<a name="boost_regex.background_information.examples.test_programs"></a><h4>
+<a name="id614398"></a>
+        <a href="examples.html#boost_regex.background_information.examples.test_programs">Test
+        Programs</a>
+      </h4>
+<p>
+        <span class="bold"><b>regress:</b></span>
+      </p>
+<p>
+        A regression test application that gives the matching/searching algorithms
+        a full workout. The presence of this program is your guarantee that the library
+        will behave as claimed - at least as far as those items tested are concerned
+        - if anyone spots anything that isn't being tested I'd be glad to hear about
+        it.
+      </p>
+<p>
+        Directory: <a href="../../../../test/regress" target="_top">libs/regex/test/regress</a>.
+      </p>
+<p>
+        Files: See directory.
+      </p>
+<p>
+        <span class="bold"><b>bad_expression_test:</b></span>
+      </p>
+<p>
+        Verifies that "bad" regular expressions don't cause the matcher
+        to go into infinite loops, but to throw an exception instead.
+      </p>
+<p>
+        Directory: <a href="../../../../test/pathology" target="_top">libs/regex/test/pathology</a>.
+      </p>
+<p>
+        Files: <a href="../../../../test/pathology/bad_expression_test.cpp" target="_top">bad_expression_test.cpp</a>.
+      </p>
+<p>
+        <span class="bold"><b>recursion_test:</b></span>
+      </p>
+<p>
+        Verifies that the matcher can't overrun the stack (no matter what the expression).
+      </p>
+<p>
+        Directory: <a href="../../../../test/pathology" target="_top">libs/regex/test/pathology</a>.
+      </p>
+<p>
+        Files: <a href="../../../../test/pathology/recursion_test.cpp" target="_top">recursion_test.cpp</a>.
+      </p>
+<p>
+        <span class="bold"><b>concepts:</b></span>
+      </p>
+<p>
+        Verifies that the library meets all documented concepts (a compile only test).
+      </p>
+<p>
+        Directory: <a href="../../../../test/concepts" target="_top">libs/regex/test/concepts</a>.
+      </p>
+<p>
+        Files: <a href="../../../../test/concepts/concept_check.cpp" target="_top">concept_check.cpp</a>.
+      </p>
+<p>
+        <span class="bold"><b>captures_test:</b></span>
+      </p>
+<p>
+        Test code for captures.
+      </p>
+<p>
+        Directory: <a href="../../../../test/captures" target="_top">libs/test/captures</a>.
+      </p>
+<p>
+        Files: <a href="../../../../test/captures/captures_test.cpp" target="_top">captures_test.cpp</a>.
+      </p>
+<a name="boost_regex.background_information.examples.example_programs"></a><h4>
+<a name="id614615"></a>
+        <a href="examples.html#boost_regex.background_information.examples.example_programs">Example
+        programs</a>
+      </h4>
+<p>
+        <span class="bold"><b>grep</b></span>
+      </p>
+<p>
+        A simple grep implementation, run with the -h command line option to find
+        out its usage.
+      </p>
+<p>
+        Files: <a href="../../../../example/grep/grep.cpp" target="_top">grep.cpp</a>
+      </p>
+<p>
+        <span class="bold"><b>timer.exe</b></span>
+      </p>
+<p>
+        A simple interactive expression matching application, the results of all
+        matches are timed, allowing the programmer to optimize their regular expressions
+        where performance is critical.
+      </p>
+<p>
+        Files: <a href="../../../../example/timer/regex_timer.cpp" target="_top">regex_timer.cpp</a>.
+      </p>
+<a name="boost_regex.background_information.examples.code_snippets"></a><h4>
+<a name="id614698"></a>
+        <a href="examples.html#boost_regex.background_information.examples.code_snippets">Code
+        snippets</a>
+      </h4>
+<p>
+        The snippets examples contain the code examples used in the documentation:
+      </p>
+<p>
+        <a href="../../../../example/snippets/captures_example.cpp" target="_top">captures_example.cpp</a>:
+        Demonstrates the use of captures.
+      </p>
+<p>
+        <a href="../../../../example/snippets/credit_card_example.cpp" target="_top">credit_card_example.cpp</a>:
+        Credit card number formatting code.
+      </p>
+<p>
+        <a href="../../../../example/snippets/partial_regex_grep.cpp" target="_top">partial_regex_grep.cpp</a>:
+        Search example using partial matches.
+      </p>
+<p>
+        <a href="../../../../example/snippets/partial_regex_match.cpp" target="_top">partial_regex_match.cpp</a>:
+        regex_match example using partial matches.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_iterator_example.cpp" target="_top">regex_iterator_example.cpp</a>:
+        Iterating through a series of matches.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_match_example.cpp" target="_top">regex_match_example.cpp</a>:
+        ftp based regex_match example.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_merge_example.cpp" target="_top">regex_merge_example.cpp</a>:
+        regex_merge example: converts a C++ file to syntax highlighted HTML.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_replace_example.cpp" target="_top">regex_replace_example.cpp</a>:
+        regex_replace example: converts a C++ file to syntax highlighted HTML
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_search_example.cpp" target="_top">regex_search_example.cpp</a>:
+        regex_search example: searches a cpp file for class definitions.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_token_iterator_eg_1.cpp" target="_top">regex_token_iterator_eg_1.cpp</a>:
+        split a string into a series of tokens.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_token_iterator_eg_2.cpp" target="_top">regex_token_iterator_eg_2.cpp</a>:
+        enumerate the linked URL's in a HTML file.
+      </p>
+<p>
+        The following are deprecated:
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_grep_example_1.cpp" target="_top">regex_grep_example_1.cpp</a>:
+        regex_grep example 1: searches a cpp file for class definitions.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_grep_example_2.cpp" target="_top">regex_grep_example_2.cpp</a>:
+        regex_grep example 2: searches a cpp file for class definitions, using a
+        global callback function.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_grep_example_3.cpp" target="_top">regex_grep_example_3.cpp</a>:
+        regex_grep example 2: searches a cpp file for class definitions, using a
+        bound member function callback.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_grep_example_4.cpp" target="_top">regex_grep_example_4.cpp</a>:
+        regex_grep example 2: searches a cpp file for class definitions, using a
+        C++ Builder closure as a callback.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_split_example_1.cpp" target="_top">regex_split_example_1.cpp</a>:
+        regex_split example: split a string into tokens.
+      </p>
+<p>
+        <a href="../../../../example/snippets/regex_split_example_2.cpp" target="_top">regex_split_example_2.cpp</a>
+        : regex_split example: spit out linked URL's.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="thread_safety.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="futher.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/faq.html b/doc/html/boost_regex/background_information/faq.html
new file mode 100644
index 00000000..e2b8b781
--- /dev/null
+++ b/doc/html/boost_regex/background_information/faq.html
@@ -0,0 +1,154 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> FAQ</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="futher.html" title=" References
+      and Further Information">
+<link rel="next" href="performance.html" title=" Performance">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="futher.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="performance.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.faq"></a><a href="faq.html" title=" FAQ"> FAQ</a></h3></div></div></div>
+<p>
+        <span class="bold"><b>Q.</b></span> I can't get regex++ to work with escape
+        characters, what's going on?
+      </p>
+<p>
+        <span class="bold"><b>A.</b></span> If you embed regular expressions in C++
+        code, then remember that escape characters are processed twice: once by the
+        C++ compiler, and once by the Boost.Regex expression compiler, so to pass
+        the regular expression \d+ to Boost.Regex, you need to embed "\d+"
+        in your code. Likewise to match a literal backslash you will need to embed
+        "\\" in your code.
+      </p>
+<p>
+        <span class="bold"><b>Q.</b></span> No matter what I do regex_match always
+        returns false, what's going on?
+      </p>
+<p>
+        <span class="bold"><b>A.</b></span> The algorithm regex_match only succeeds
+        if the expression matches <span class="bold"><b>all</b></span> of the text,
+        if you want to <span class="bold"><b>find</b></span> a sub-string within
+        the text that matches the expression then use regex_search instead.
+      </p>
+<p>
+        <span class="bold"><b>Q.</b></span> Why does using parenthesis in a POSIX
+        regular expression change the result of a match?
+      </p>
+<p>
+        <span class="bold"><b>A.</b></span> For POSIX (extended and basic) regular
+        expressions, but not for perl regexes, parentheses don't only mark; they
+        determine what the best match is as well. When the expression is compiled
+        as a POSIX basic or extended regex then Boost.Regex follows the POSIX standard
+        leftmost longest rule for determining what matched. So if there is more than
+        one possible match after considering the whole expression, it looks next
+        at the first sub-expression and then the second sub-expression and so on.
+        So...
+      </p>
+<p>
+        "(0*)([0-9]*)" against "00123" would produce $1 = "00"
+        $2 = "123"
+      </p>
+<p>
+        where as
+      </p>
+<p>
+        "0*([0-9])*" against "00123" would produce $1 = "00123"
+      </p>
+<p>
+        If you think about it, had $1 only matched the "123", this would
+        be "less good" than the match "00123" which is both further
+        to the left and longer. If you want $1 to match only the "123"
+        part, then you need to use something like:
+      </p>
+<p>
+        "0*([1-9][0-9]*)"
+      </p>
+<p>
+        as the expression.
+      </p>
+<p>
+        <span class="bold"><b>Q.</b></span> Why don't character ranges work properly
+        (POSIX mode only)?
+      </p>
+<p>
+        <span class="bold"><b>A.</b></span> The POSIX standard specifies that character
+        range expressions are locale sensitive - so for example the expression [A-Z]
+        will match any collating element that collates between 'A' and 'Z'. That
+        means that for most locales other than "C" or "POSIX",
+        [A-Z] would match the single character 't' for example, which is not what
+        most people expect - or at least not what most people have come to expect
+        from regular expression engines. For this reason, the default behaviour of
+        Boost.Regex (perl mode) is to turn locale sensitive collation off by not
+        setting the <tt class="computeroutput"><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">collate</span></tt>
+        compile time flag. However if you set a non-default compile time flag - for
+        example <tt class="computeroutput"><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">extended</span></tt> or <tt class="computeroutput"><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">basic</span></tt>,
+        then locale dependent collation will be enabled, this also applies to the
+        POSIX API functions which use either <tt class="computeroutput"><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">extended</span></tt>
+        or <tt class="computeroutput"><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">basic</span></tt> internally. [Note - when <tt class="computeroutput"><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">nocollate</span></tt> in effect, the library behaves
+        "as if" the LC_COLLATE locale category were always "C",
+        regardless of what its actually set to - end note].
+      </p>
+<p>
+        <span class="bold"><b>Q.</b></span> Why are there no throw specifications
+        on any of the functions? What exceptions can the library throw?
+      </p>
+<p>
+        <span class="bold"><b>A.</b></span> Not all compilers support (or honor)
+        throw specifications, others support them but with reduced efficiency. Throw
+        specifications may be added at a later date as compilers begin to handle
+        this better. The library should throw only three types of exception: [boost::regex_error]
+        can be thrown by <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> when compiling a regular
+        expression, <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt> can be thrown when a call
+        to <tt class="computeroutput"><span class="identifier">basic_regex</span><span class="special">::</span><span class="identifier">imbue</span></tt> tries to open a message catalogue
+        that doesn't exist, or when a call to <a href="../ref/regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a> or <a href="../ref/regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a> results in an "everlasting"
+        search, or when a call to <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">::</span><span class="identifier">GrepFiles</span></tt>
+        or <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">::</span><span class="identifier">FindFiles</span></tt> tries to open a file that cannot
+        be opened, finally <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">bad_alloc</span></tt> can be thrown by just about any
+        of the functions in this library.
+      </p>
+<p>
+        <span class="bold"><b>Q.</b></span> Why can't I use the "convenience"
+        versions of regex_match / regex_search / regex_grep / regex_format / regex_merge?
+      </p>
+<p>
+        <span class="bold"><b>A.</b></span> These versions may or may not be available
+        depending upon the capabilities of your compiler, the rules determining the
+        format of these functions are quite complex - and only the versions visible
+        to a standard compliant compiler are given in the help. To find out what
+        your compiler supports, run &lt;boost/regex.hpp&gt; through your C++ pre-processor,
+        and search the output file for the function that you are interested in. Note
+        however, that very few current compilers still have problems with these overloaded
+        functions.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="futher.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="performance.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/futher.html b/doc/html/boost_regex/background_information/futher.html
new file mode 100644
index 00000000..4463bda9
--- /dev/null
+++ b/doc/html/boost_regex/background_information/futher.html
@@ -0,0 +1,77 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> References
+      and Further Information</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="examples.html" title=" Test and
+      Example Programs">
+<link rel="next" href="faq.html" title=" FAQ">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="examples.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="faq.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.futher"></a><a href="futher.html" title=" References
+      and Further Information"> References
+      and Further Information</a></h3></div></div></div>
+<p>
+        Short tutorials on regular expressions can be <a href="http://etext.lib.virginia.edu/helpsheets/regex.html" target="_top">found
+        here</a> and <a href="http://www.linuxpcug.org/lessons/regexp.html" target="_top">here</a>.
+      </p>
+<p>
+        The main book on regular expressions is <a href="http://www.oreilly.com/catalog/regex/" target="_top">Mastering
+        Regular Expressions, published by O'Reilly</a>.
+      </p>
+<p>
+        Boost.Regex forms the basis for the regular expression chapter of the <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf" target="_top">Technical
+        Report on C++ Library Extensions</a>.
+      </p>
+<p>
+        The <a href="http://www.opengroup.org/onlinepubs/7908799/toc.htm" target="_top">Open
+        Unix Specification</a> contains a wealth of useful material, including
+        the POSIX regular expression syntax.
+      </p>
+<p>
+        The <a href="http://www.cs.ucr.edu/~stelo/pattern.html" target="_top">Pattern Matching
+        Pointers</a> site is a "must visit" resource for anyone interested
+        in pattern matching.
+      </p>
+<p>
+        <a href="http://glimpse.cs.arizona.edu/" target="_top">Glimpse and Agrep</a>, use
+        a simplified regular expression syntax to achieve faster search times.
+      </p>
+<p>
+        <a href="http://glimpse.cs.arizona.edu/udi.html" target="_top">Udi Manber</a> and
+        <a href="http://www.dcc.uchile.cl/~rbaeza/" target="_top">Ricardo Baeza-Yates</a>
+        both have a selection of useful pattern matching papers available from their
+        respective web sites.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="examples.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="faq.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/headers.html b/doc/html/boost_regex/background_information/headers.html
new file mode 100644
index 00000000..a351f381
--- /dev/null
+++ b/doc/html/boost_regex/background_information/headers.html
@@ -0,0 +1,52 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Headers</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="../background_information.html" title="Background Information">
+<link rel="next" href="locale.html" title=" Localization">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../background_information.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="locale.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.headers"></a><a href="headers.html" title=" Headers"> Headers</a></h3></div></div></div>
+<p>
+        There are two main headers used by this library: <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>
+        provides full access to the main template library, while <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">cregex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>
+        provides access to the (deprecated) high level class RegEx, and the POSIX
+        API functions.
+      </p>
+<p>
+        There is also a header containing only forward declarations <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>
+        for use when an interface is dependent upon <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>, but otherwise does
+        not need the full definitions.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../background_information.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="locale.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/history.html b/doc/html/boost_regex/background_information/history.html
new file mode 100644
index 00000000..db846835
--- /dev/null
+++ b/doc/html/boost_regex/background_information/history.html
@@ -0,0 +1,233 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> History</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="acknowledgements.html" title="
+      Acknowledgements">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="acknowledgements.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.history"></a><a href="history.html" title=" History"> History</a></h3></div></div></div>
+<a name="boost_regex.background_information.history.boost_1_34"></a><h4>
+<a name="id616902"></a>
+        <a href="history.html#boost_regex.background_information.history.boost_1_34">Boost
+        1.34</a>
+      </h4>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          Fix for non-greedy repeats and partial matches not working correctly in
+          some cases.
+        </li>
+<li>
+          Fix for non-greedy repeats on VC++ not working in some cases (bug report
+          1515830).
+        </li>
+<li>
+          Changed match_results::position() to return a valid result when *this represents
+          a partial match.
+        </li>
+<li>
+          Fixed the grep and egrep options so that the newline character gets treated
+          the same as |.
+        </li>
+</ul></div>
+<a name="boost_regex.background_information.history.boost_1_33_1"></a><h4>
+<a name="id616955"></a>
+        <a href="history.html#boost_regex.background_information.history.boost_1_33_1">Boost
+        1.33.1</a>
+      </h4>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          Fixed broken makefiles.
+        </li>
+<li>
+          Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2
+          when using /Zc:wchar_t.
+        </li>
+<li>
+          Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler
+          can cope.
+        </li>
+<li>
+          Added needed standard library #includes to fileiter.hpp, regex_workaround.hpp
+          and cpp_regex_traits.hpp.
+        </li>
+<li>
+          Fixed a bug where non-greedy repeats could in certain strange curcumstances
+          repeat more times than their maximum value.
+        </li>
+<li>
+          Fixed the value returned by basic_regex&lt;&gt;::empty() from a default
+          constructed object.
+        </li>
+<li>
+          Changed the deffinition of regex_error to make it backwards compatible
+          with Boost-1.32.0.
+        </li>
+<li>
+          Disabled external templates for Intel C++ 8.0 and earlier - otherwise unresolved
+          references can occur.
+        </li>
+<li>
+          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.
+        </li>
+<li>
+          Initialise all the data members of the unicode_iterators: this keeps gcc
+          from issuing needless warnings.
+        </li>
+<li>
+          Ported the ICU integration code to VC6 and VC7.
+        </li>
+<li>
+          Ensured code is STLport debug mode clean.
+        </li>
+<li>
+          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).
+        </li>
+<li>
+          Fixed strange bug with non-greedy repeats inside forward lookahead assertions.
+        </li>
+<li>
+          Enabled negated character classes inside character sets.
+        </li>
+<li>
+          Fixed regression so that [a-z-] is a valid expression again.
+        </li>
+<li>
+          Fixed bug that allowed some invalid expressions to be accepted.
+        </li>
+</ul></div>
+<a name="boost_regex.background_information.history.boost_1_33_0"></a><h4>
+<a name="id617086"></a>
+        <a href="history.html#boost_regex.background_information.history.boost_1_33_0">Boost
+        1.33.0</a>
+      </h4>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          Completely rewritten expression parsing code, and traits class support;
+          now conforms to the standardization proposal.
+        </li>
+<li>
+          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 to which regular expression
+          syntax styles (perl, POSIX-extended, POSIX-basic etc). Some of the more
+          esoteric options have now been removed, so there is the possibility that
+          existing code may fail to compile: however equivalent functionality should
+          still be available.
+        </li>
+<li>
+          Breaking Change: POSIX-extended and POSIX-basic regular expressions now
+          enforce the letter of the POSIX standard much more closely than before.
+        </li>
+<li>
+          Added support for (?imsx-imsx) constructs.
+        </li>
+<li>
+          Added support for lookbehind expressions (?&lt;=positive-lookbehind) and
+          (?&lt;!negative-lookbehind).
+        </li>
+<li>
+          Added support for conditional expressions (?(assertion)true-expresion|false-expression).
+        </li>
+<li>
+          Added MFC/ATL string wrappers.
+        </li>
+<li>
+          Added Unicode support; based on ICU.
+        </li>
+<li>
+          Changed newline support to recognise \f as a line separator (all character
+          types), and \x85 as a line separator for wide characters / Unicode only.
+        </li>
+<li>
+          Added a new format flag format_literal that treats the replace string as
+          a literal, rather than a Perl or Sed style format string.
+        </li>
+<li>
+          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: code() to
+          report an error code rather than a string, and position() to report where
+          in the expression the error occured.
+        </li>
+</ul></div>
+<a name="boost_regex.background_information.history.boost_1_32_1"></a><h4>
+<a name="id617194"></a>
+        <a href="history.html#boost_regex.background_information.history.boost_1_32_1">Boost
+        1.32.1</a>
+      </h4>
+<div class="itemizedlist"><ul type="disc"><li>
+          Fixed bug in partial matches of bounded repeats of '.'.
+        </li></ul></div>
+<a name="boost_regex.background_information.history.boost_1_31_0"></a><h4>
+<a name="id617229"></a>
+        <a href="history.html#boost_regex.background_information.history.boost_1_31_0">Boost
+        1.31.0</a>
+      </h4>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          Completely rewritten pattern matching code - it is now up to 10 times faster
+          than before.
+        </li>
+<li>
+          Reorganized documentation.
+        </li>
+<li>
+          Deprecated all interfaces that are not part of the regular expression standardization
+          proposal.
+        </li>
+<li>
+          Added regex_iterator and regex_token_iterator .
+        </li>
+<li>
+          Added support for Perl style independent sub-expressions.
+        </li>
+<li>
+          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.
+        </li>
+<li>
+          Added experimental support for extended capture information.
+        </li>
+<li>
+          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.
+        </li>
+</ul></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="acknowledgements.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/locale.html b/doc/html/boost_regex/background_information/locale.html
new file mode 100644
index 00000000..78e77de2
--- /dev/null
+++ b/doc/html/boost_regex/background_information/locale.html
@@ -0,0 +1,1792 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Localization</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="headers.html" title=" Headers">
+<link rel="next" href="thread_safety.html" title=" Thread
+      Safety">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="headers.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="thread_safety.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.locale"></a><a href="locale.html" title=" Localization"> Localization</a></h3></div></div></div>
+<p>
+        Boost.Regex provides extensive support for run-time localization, the localization
+        model used can be split into two parts: front-end and back-end.
+      </p>
+<p>
+        Front-end localization deals with everything which the user sees - error
+        messages, and the regular expression syntax itself. For example a French
+        application could change [[:word:]] to [[:mot:]] and \w to \m. Modifying
+        the front end locale requires active support from the developer, by providing
+        the library with a message catalogue to load, containing the localized strings.
+        Front-end locale is affected by the LC_MESSAGES category only.
+      </p>
+<p>
+        Back-end localization deals with everything that occurs after the expression
+        has been parsed - in other words everything that the user does not see or
+        interact with directly. It deals with case conversion, collation, and character
+        class membership. The back-end locale does not require any intervention from
+        the developer - the library will acquire all the information it requires
+        for the current locale from the underlying operating system / run time library.
+        This means that if the program user does not interact with regular expressions
+        directly - for example if the expressions are embedded in your C++ code -
+        then no explicit localization is required, as the library will take care
+        of everything for you. For example embedding the expression [[:word:]]+ in
+        your code will always match a whole word, if the program is run on a machine
+        with, for example, a Greek locale, then it will still match a whole word,
+        but in Greek characters rather than Latin ones. The back-end locale is affected
+        by the LC_TYPE and LC_COLLATE categories.
+      </p>
+<p>
+        There are three separate localization mechanisms supported by Boost.Regex:
+      </p>
+<a name="boost_regex.background_information.locale.win32_localization_model_"></a><h4>
+<a name="id610859"></a>
+        <a href="locale.html#boost_regex.background_information.locale.win32_localization_model_">Win32
+        localization model.</a>
+      </h4>
+<p>
+        This is the default model when the library is compiled under Win32, and is
+        encapsulated by the traits class <tt class="computeroutput"><span class="identifier">w32_regex_traits</span></tt>.
+        When this model is in effect each <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> object gets it's own
+        LCID, by default this is the users default setting as returned by GetUserDefaultLCID,
+        but you can call imbue on the <tt class="computeroutput"><span class="identifier">basic_regex</span></tt>
+        object to set it's locale to some other LCID if you wish. All the settings
+        used by Boost.Regex are acquired directly from the operating system bypassing
+        the C run time library. Front-end localization requires a resource dll, containing
+        a string table with the user-defined strings. The traits class exports the
+        function:
+      </p>
+<pre class="programlisting">
+<span class="keyword">static</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">set_message_catalogue</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
+</pre>
+<p>
+        which needs to be called with a string identifying the name of the resource
+        dll, before your code compiles any regular expressions (but not necessarily
+        before you construct any <tt class="computeroutput"><span class="identifier">basic_regex</span></tt>
+        instances):
+      </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">w32_regex_traits</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;::</span><span class="identifier">set_message_catalogue</span><span class="special">(</span><span class="string">"mydll.dll"</span><span class="special">);</span>
+</pre>
+<p>
+        The library provides full Unicode support under NT, under Windows 9x the
+        library degrades gracefully - characters 0 to 255 are supported, the remainder
+        are treated as "unknown" graphic characters.
+      </p>
+<a name="boost_regex.background_information.locale.c_localization_model_"></a><h4>
+<a name="id611109"></a>
+        <a href="locale.html#boost_regex.background_information.locale.c_localization_model_">C
+        localization model.</a>
+      </h4>
+<p>
+        This model has been deprecated in favor of the C++ locale for all non-Windows
+        compilers that support it. This locale is encapsulated by the traits class
+        <tt class="computeroutput"><span class="identifier">c_regex_traits</span></tt>, Win32 users
+        can force this model to take effect by defining the pre-processor symbol
+        BOOST_REGEX_USE_C_LOCALE. When this model is in effect there is a single
+        global locale, as set by <tt class="computeroutput"><span class="identifier">setlocale</span></tt>.
+        All settings are acquired from your run time library, consequently Unicode
+        support is dependent upon your run time library implementation.
+      </p>
+<p>
+        Front end localization is not supported.
+      </p>
+<p>
+        Note that calling setlocale invalidates all compiled regular expressions,
+        calling <tt class="computeroutput"><span class="identifier">setlocale</span><span class="special">(</span><span class="identifier">LC_ALL</span><span class="special">,</span> <span class="string">"C"</span><span class="special">)</span></tt>
+        will make this library behave equivalent to most traditional regular expression
+        libraries including version 1 of this library.
+      </p>
+<a name="boost_regex.background_information.locale.c___localization_model_"></a><h4>
+<a name="id611224"></a>
+        <a href="locale.html#boost_regex.background_information.locale.c___localization_model_">C++
+        localization model.</a>
+      </h4>
+<p>
+        This model is the default for non-Windows compilers.
+      </p>
+<p>
+        When this model is in effect each instance of <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> has its own instance
+        of <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">locale</span></tt>, class <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> also has a member function
+        <tt class="computeroutput"><span class="identifier">imbue</span></tt> which allows the locale
+        for the expression to be set on a per-instance basis. Front end localization
+        requires a POSIX message catalogue, which will be loaded via the <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">messages</span></tt>
+        facet of the expression's locale, the traits class exports the symbol:
+      </p>
+<pre class="programlisting">
+<span class="keyword">static</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">set_message_catalogue</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
+</pre>
+<p>
+        which needs to be called with a string identifying the name of the message
+        catalogue, before your code compiles any regular expressions (but not necessarily
+        before you construct any basic_regex instances):
+      </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">cpp_regex_traits</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;::</span><span class="identifier">set_message_catalogue</span><span class="special">(</span><span class="string">"mycatalogue"</span><span class="special">);</span>
+</pre>
+<p>
+        Note that calling <tt class="computeroutput"><span class="identifier">basic_regex</span><span class="special">&lt;&gt;::</span><span class="identifier">imbue</span></tt>
+        will invalidate any expression currently compiled in that instance of <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>.
+      </p>
+<p>
+        Finally note that if you build the library with a non-default localization
+        model, then the appropriate pre-processor symbol (BOOST_REGEX_USE_C_LOCALE
+        or BOOST_REGEX_USE_CPP_LOCALE) must be defined both when you build the support
+        library, and when you include <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>
+        or <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">cregex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>
+        in your code. The best way to ensure this is to add the #define to <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">user</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>.
+      </p>
+<a name="boost_regex.background_information.locale.providing_a_message_catalogue"></a><h4>
+<a name="id611693"></a>
+        <a href="locale.html#boost_regex.background_information.locale.providing_a_message_catalogue">Providing
+        a message catalogue</a>
+      </h4>
+<p>
+        In order to localize the front end of the library, you need to provide the
+        library with the appropriate message strings contained either in a resource
+        dll's string table (Win32 model), or a POSIX message catalogue (C++ models).
+        In the latter case the messages must appear in message set zero of the catalogue.
+        The messages and their id's are as follows:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Message
+              </p>
+              </th>
+<th>
+              <p>
+                id
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+<th>
+              <p>
+                Default value
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                101
+              </p>
+              </td>
+<td>
+              <p>
+                The character used to start a sub-expression.
+              </p>
+              </td>
+<td>
+              <p>
+                "("
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                102
+              </p>
+              </td>
+<td>
+              <p>
+                The character used to end a sub-expression declaration.
+              </p>
+              </td>
+<td>
+              <p>
+                ")"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                103
+              </p>
+              </td>
+<td>
+              <p>
+                The character used to denote an end of line assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "$"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                104
+              </p>
+              </td>
+<td>
+              <p>
+                The character used to denote the start of line assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "^"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                105
+              </p>
+              </td>
+<td>
+              <p>
+                The character used to denote the "match any character expression".
+              </p>
+              </td>
+<td>
+              <p>
+                "."
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                106
+              </p>
+              </td>
+<td>
+              <p>
+                The match zero or more times repetition operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "*"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                107
+              </p>
+              </td>
+<td>
+              <p>
+                The match one or more repetition operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "+"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                108
+              </p>
+              </td>
+<td>
+              <p>
+                The match zero or one repetition operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "?"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                109
+              </p>
+              </td>
+<td>
+              <p>
+                The character set opening character.
+              </p>
+              </td>
+<td>
+              <p>
+                "["
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                110
+              </p>
+              </td>
+<td>
+              <p>
+                The character set closing character.
+              </p>
+              </td>
+<td>
+              <p>
+                "]"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                111
+              </p>
+              </td>
+<td>
+              <p>
+                The alternation operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "|"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                112
+              </p>
+              </td>
+<td>
+              <p>
+                The escape character.
+              </p>
+              </td>
+<td>
+              <p>
+                "\"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                113
+              </p>
+              </td>
+<td>
+              <p>
+                The hash character (not currently used).
+              </p>
+              </td>
+<td>
+              <p>
+                "#"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                114
+              </p>
+              </td>
+<td>
+              <p>
+                The range operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "-"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                115
+              </p>
+              </td>
+<td>
+              <p>
+                The repetition operator opening character.
+              </p>
+              </td>
+<td>
+              <p>
+                "{"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                116
+              </p>
+              </td>
+<td>
+              <p>
+                The repetition operator closing character.
+              </p>
+              </td>
+<td>
+              <p>
+                "}"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                117
+              </p>
+              </td>
+<td>
+              <p>
+                The digit characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "0123456789"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                118
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the word boundary assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "b"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                119
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the non-word boundary assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "B"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                120
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the word-start boundary assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "&lt;"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                121
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the word-end boundary assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "&gt;"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                122
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any word character.
+              </p>
+              </td>
+<td>
+              <p>
+                "w"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                123
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                a non-word character.
+              </p>
+              </td>
+<td>
+              <p>
+                "W"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                124
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                a start of buffer assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "`A"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                125
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                an end of buffer assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "'z"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                126
+              </p>
+              </td>
+<td>
+              <p>
+                The newline character.
+              </p>
+              </td>
+<td>
+              <p>
+                "\n"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                127
+              </p>
+              </td>
+<td>
+              <p>
+                The comma separator.
+              </p>
+              </td>
+<td>
+              <p>
+                ","
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                128
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the bell character.
+              </p>
+              </td>
+<td>
+              <p>
+                "a"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                129
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the form feed character.
+              </p>
+              </td>
+<td>
+              <p>
+                "f"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                130
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the newline character.
+              </p>
+              </td>
+<td>
+              <p>
+                "n"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                131
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the carriage return character.
+              </p>
+              </td>
+<td>
+              <p>
+                "r"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                132
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the tab character.
+              </p>
+              </td>
+<td>
+              <p>
+                "t"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                133
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the vertical tab character.
+              </p>
+              </td>
+<td>
+              <p>
+                "v"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                134
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the start of a hexadecimal character constant.
+              </p>
+              </td>
+<td>
+              <p>
+                "x"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                135
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the start of an ASCII escape character.
+              </p>
+              </td>
+<td>
+              <p>
+                "c"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                136
+              </p>
+              </td>
+<td>
+              <p>
+                The colon character.
+              </p>
+              </td>
+<td>
+              <p>
+                ":"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                137
+              </p>
+              </td>
+<td>
+              <p>
+                The equals character.
+              </p>
+              </td>
+<td>
+              <p>
+                "="
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                138
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the ASCII escape character.
+              </p>
+              </td>
+<td>
+              <p>
+                "e"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                139
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any lower case character.
+              </p>
+              </td>
+<td>
+              <p>
+                "l"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                140
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any non-lower case character.
+              </p>
+              </td>
+<td>
+              <p>
+                "L"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                141
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any upper case character.
+              </p>
+              </td>
+<td>
+              <p>
+                "u"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                142
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any non-upper case character.
+              </p>
+              </td>
+<td>
+              <p>
+                "U"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                143
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any space character.
+              </p>
+              </td>
+<td>
+              <p>
+                "s"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                144
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any non-space character.
+              </p>
+              </td>
+<td>
+              <p>
+                "S"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                145
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any digit character.
+              </p>
+              </td>
+<td>
+              <p>
+                "d"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                146
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any non-digit character.
+              </p>
+              </td>
+<td>
+              <p>
+                "D"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                147
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the end quote operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "E"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                148
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the start quote operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "Q"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                149
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                a Unicode combining character sequence.
+              </p>
+              </td>
+<td>
+              <p>
+                "X"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                150
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                any single character.
+              </p>
+              </td>
+<td>
+              <p>
+                "C"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                151
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                end of buffer operator.
+              </p>
+              </td>
+<td>
+              <p>
+                "Z"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                152
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceded by an escape character represents
+                the continuation assertion.
+              </p>
+              </td>
+<td>
+              <p>
+                "G"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                153
+              </p>
+              </td>
+<td>
+              <p>
+                The character which when preceeded by (? indicates a zero width negated
+                forward lookahead assert.
+              </p>
+              </td>
+<td>
+              <p>
+                !
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        Custom error messages are loaded as follows:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Message ID
+              </p>
+              </th>
+<th>
+              <p>
+                Error message ID
+              </p>
+              </th>
+<th>
+              <p>
+                Default string
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                201
+              </p>
+              </td>
+<td>
+              <p>
+                REG_NOMATCH
+              </p>
+              </td>
+<td>
+              <p>
+                "No match"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                202
+              </p>
+              </td>
+<td>
+              <p>
+                REG_BADPAT
+              </p>
+              </td>
+<td>
+              <p>
+                "Invalid regular expression"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                203
+              </p>
+              </td>
+<td>
+              <p>
+                REG_ECOLLATE
+              </p>
+              </td>
+<td>
+              <p>
+                "Invalid collation character"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                204
+              </p>
+              </td>
+<td>
+              <p>
+                REG_ECTYPE
+              </p>
+              </td>
+<td>
+              <p>
+                "Invalid character class name"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                205
+              </p>
+              </td>
+<td>
+              <p>
+                REG_EESCAPE
+              </p>
+              </td>
+<td>
+              <p>
+                "Trailing backslash"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                206
+              </p>
+              </td>
+<td>
+              <p>
+                REG_ESUBREG
+              </p>
+              </td>
+<td>
+              <p>
+                "Invalid back reference"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                207
+              </p>
+              </td>
+<td>
+              <p>
+                REG_EBRACK
+              </p>
+              </td>
+<td>
+              <p>
+                "Unmatched [ or <tt class="literal">" </tt>
+              </p>
+              </td>
+<td>
+              <p>
+                [208
+              </p>
+              </td>
+<td>
+              <p>
+                REG_EPAREN
+              </p>
+              </td>
+<td>
+              <p>
+                "Unmatched ( or \("
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                209
+              </p>
+              </td>
+<td>
+              <p>
+                REG_EBRACE
+              </p>
+              </td>
+<td>
+              <p>
+                "Unmatched \{"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                210
+              </p>
+              </td>
+<td>
+              <p>
+                REG_BADBR
+              </p>
+              </td>
+<td>
+              <p>
+                "Invalid content of \{\}"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                211
+              </p>
+              </td>
+<td>
+              <p>
+                REG_ERANGE
+              </p>
+              </td>
+<td>
+              <p>
+                "Invalid range end"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                212
+              </p>
+              </td>
+<td>
+              <p>
+                REG_ESPACE
+              </p>
+              </td>
+<td>
+              <p>
+                "Memory exhausted"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                213
+              </p>
+              </td>
+<td>
+              <p>
+                REG_BADRPT
+              </p>
+              </td>
+<td>
+              <p>
+                "Invalid preceding regular expression"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                214
+              </p>
+              </td>
+<td>
+              <p>
+                REG_EEND
+              </p>
+              </td>
+<td>
+              <p>
+                "Premature end of regular expression"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                215
+              </p>
+              </td>
+<td>
+              <p>
+                REG_ESIZE
+              </p>
+              </td>
+<td>
+              <p>
+                "Regular expression too big"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                216
+              </p>
+              </td>
+<td>
+              <p>
+                REG_ERPAREN
+              </p>
+              </td>
+<td>
+              <p>
+                "Unmatched ) or \)"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                217
+              </p>
+              </td>
+<td>
+              <p>
+                REG_EMPTY
+              </p>
+              </td>
+<td>
+              <p>
+                "Empty expression"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                218
+              </p>
+              </td>
+<td>
+              <p>
+                REG_E_UNKNOWN
+              </p>
+              </td>
+<td>
+              <p>
+                "Unknown error"
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        Custom character class names are loaded as followed:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Message ID
+              </p>
+              </th>
+<th>
+              <p>
+                Description
+              </p>
+              </th>
+<th>
+              <p>
+                Equivalent default class name
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                300
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for alphanumeric characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "alnum"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                301
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for alphabetic characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "alpha"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                302
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for control characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "cntrl"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                303
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for digit characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "digit"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                304
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for graphics characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "graph"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                305
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for lower case characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "lower"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                306
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for printable characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "print"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                307
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for punctuation characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "punct"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                308
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for space characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "space"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                309
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for upper case characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "upper"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                310
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for hexadecimal characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "xdigit"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                311
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for blank characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "blank"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                312
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for word characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "word"
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                313
+              </p>
+              </td>
+<td>
+              <p>
+                The character class name for Unicode characters.
+              </p>
+              </td>
+<td>
+              <p>
+                "unicode"
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        Finally, custom collating element names are loaded starting from message
+        id 400, and terminating when the first load thereafter fails. Each message
+        looks something like: "tagname string" where tagname is the name
+        used inside [[.tagname.]] and string is the actual text of the collating
+        element. Note that the value of collating element [[.zero.]] is used for
+        the conversion of strings to numbers - if you replace this with another value
+        then that will be used for string parsing - for example use the Unicode character
+        0x0660 for [[.zero.]] if you want to use Unicode Arabic-Indic digits in your
+        regular expressions in place of Latin digits.
+      </p>
+<p>
+        Note that the POSIX defined names for character classes and collating elements
+        are always available - even if custom names are defined, in contrast, custom
+        error messages, and custom syntax messages replace the default ones.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="headers.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="thread_safety.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/performance.html b/doc/html/boost_regex/background_information/performance.html
new file mode 100644
index 00000000..be5ed7c2
--- /dev/null
+++ b/doc/html/boost_regex/background_information/performance.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Performance</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="faq.html" title=" FAQ">
+<link rel="next" href="standards.html" title=" Standards
+      Conformance">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="faq.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="standards.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.performance"></a><a href="performance.html" title=" Performance"> Performance</a></h3></div></div></div>
+<p>
+        The performance of Boost.Regex in both recursive and non-recursive modes
+        should be broadly comparable to other regular expression libraries: recursive
+        mode is slightly faster (especially where memory allocation requires thread
+        synchronisation), but not by much. The following pages compare Boost.Regex
+        with various other regular expression libraries for the following compilers:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+<a href="../../../vc71-performance.html" target="_top">Visual Studio.Net 2003 (recursive
+          Boost.Regex implementation)</a>.
+        </li>
+<li>
+<a href="../../../gcc-performance.html" target="_top">Gcc 3.2 (cygwin) (non-recursive Boost.Regex
+          implementation)</a>.
+        </li>
+</ul></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="faq.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="standards.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/redist.html b/doc/html/boost_regex/background_information/redist.html
new file mode 100644
index 00000000..fb7917f6
--- /dev/null
+++ b/doc/html/boost_regex/background_information/redist.html
@@ -0,0 +1,61 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Redistributables</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="standards.html" title=" Standards
+      Conformance">
+<link rel="next" href="acknowledgements.html" title="
+      Acknowledgements">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="standards.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.redist"></a><a href="redist.html" title=" Redistributables"> Redistributables</a></h3></div></div></div>
+<p>
+        If you are using Microsoft or Borland C++ and link to a dll version of the
+        run time library, then you can choose to also link to a dll version of Boost.Regex
+        by defining the symbol BOOST_REGEX_DYN_LINK when you compile your code. While
+        these dll's are redistributable, there are no "standard" versions,
+        so when installing on the users PC, you should place these in a directory
+        private to your application, and not in the PC's directory path. Note that
+        if you link to a static version of your run time library, then you will also
+        link to a static version of Boost.Regex and no dll's will need to be distributed.
+        The possible Boost.Regex dll and library names are computed according to
+        the formula given in <a href="../../../../../../more/getting_started.html" target="_top">the
+        getting started guide</a>.
+      </p>
+<p>
+        Note: you can disable automatic library selection by defining the symbol
+        BOOST_REGEX_NO_LIB when compiling, this is useful if you want to build Boost.Regex
+        yourself in your IDE, or if you need to debug Boost.Regex.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="standards.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/standards.html b/doc/html/boost_regex/background_information/standards.html
new file mode 100644
index 00000000..8efaff79
--- /dev/null
+++ b/doc/html/boost_regex/background_information/standards.html
@@ -0,0 +1,563 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Standards
+      Conformance</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="performance.html" title=" Performance">
+<link rel="next" href="redist.html" title=" Redistributables">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="performance.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="redist.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.standards"></a><a href="standards.html" title=" Standards
+      Conformance"> Standards
+      Conformance</a></h3></div></div></div>
+<a name="boost_regex.background_information.standards.c__"></a><h4>
+<a name="id615703"></a>
+        <a href="standards.html#boost_regex.background_information.standards.c__">C++</a>
+      </h4>
+<p>
+        Boost.Regex is intended to conform to the <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf" target="_top">Technical
+        Report on C++ Library Extensions</a>.
+      </p>
+<a name="boost_regex.background_information.standards.ecmascript___javascript"></a><h4>
+<a name="id615743"></a>
+        <a href="standards.html#boost_regex.background_information.standards.ecmascript___javascript">ECMAScript
+        / JavaScript</a>
+      </h4>
+<p>
+        All of the ECMAScript regular expression syntax features are supported, except
+        that:
+      </p>
+<p>
+        The escape sequence \u matches any upper case character (the same as [[:upper:]])
+        rather than a Unicode escape sequence; use \x{DDDD} for Unicode escape sequences.
+      </p>
+<a name="boost_regex.background_information.standards.perl"></a><h4>
+<a name="id615784"></a>
+        <a href="standards.html#boost_regex.background_information.standards.perl">Perl</a>
+      </h4>
+<p>
+        Almost all Perl features are supported, except for:
+      </p>
+<p>
+        (?{code}) Not implementable in a compiled strongly typed language.
+      </p>
+<p>
+        (??{code}) Not implementable in a compiled strongly typed language.
+      </p>
+<a name="boost_regex.background_information.standards.posix"></a><h4>
+<a name="id615824"></a>
+        <a href="standards.html#boost_regex.background_information.standards.posix">POSIX</a>
+      </h4>
+<p>
+        All the POSIX basic and extended regular expression features are supported,
+        except that:
+      </p>
+<p>
+        No character collating names are recognized except those specified in the
+        POSIX standard for the C locale, unless they are explicitly registered with
+        the traits class.
+      </p>
+<p>
+        Character equivalence classes ( [[=a=]] etc) are probably buggy except on
+        Win32. Implementing this feature requires knowledge of the format of the
+        string sort keys produced by the system; if you need this, and the default
+        implementation doesn't work on your platform, then you will need to supply
+        a custom traits class.
+      </p>
+<a name="boost_regex.background_information.standards.unicode"></a><h4>
+<a name="id615873"></a>
+        <a href="standards.html#boost_regex.background_information.standards.unicode">Unicode</a>
+      </h4>
+<p>
+        The following comments refer to <a href="http://unicode.org/reports/tr18/" target="_top">Unicode
+        Technical Standard #18: Unicode Regular Expressions version 11</a>.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Item
+              </p>
+              </th>
+<th>
+              <p>
+                Feature
+              </p>
+              </th>
+<th>
+              <p>
+                Support
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                1.1
+              </p>
+              </td>
+<td>
+              <p>
+                Hex Notation
+              </p>
+              </td>
+<td>
+              <p>
+                Yes: use \x{DDDD} to refer to code point UDDDD.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                1.2
+              </p>
+              </td>
+<td>
+              <p>
+                Character Properties
+              </p>
+              </td>
+<td>
+              <p>
+                All the names listed under the General Category Property are supported.
+                Script names and Other Names are not currently supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                1.3
+              </p>
+              </td>
+<td>
+              <p>
+                Subtraction and Intersection
+              </p>
+              </td>
+<td>
+              <p>
+                Indirectly support by forward-lookahead:
+              </p>
+              <p>
+                <tt class="computeroutput"><span class="special">(?=[[:</span><span class="identifier">X</span><span class="special">:]])[[:</span><span class="identifier">Y</span><span class="special">:]]</span></tt>
+              </p>
+              <p>
+                Gives the intersection of character properties X and Y.
+              </p>
+              <p>
+                <tt class="computeroutput"><span class="special">(?![[:</span><span class="identifier">X</span><span class="special">:]])[[:</span><span class="identifier">Y</span><span class="special">:]]</span></tt>
+              </p>
+              <p>
+                Gives everything in Y that is not in X (subtraction).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                1.4
+              </p>
+              </td>
+<td>
+              <p>
+                Simple Word Boundaries
+              </p>
+              </td>
+<td>
+              <p>
+                Conforming: non-spacing marks are included in the set of word characters.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                1.5
+              </p>
+              </td>
+<td>
+              <p>
+                Caseless Matching
+              </p>
+              </td>
+<td>
+              <p>
+                Supported, note that at this level, case transformations are 1:1,
+                many to many case folding operations are not supported (for example
+                "ß" to "SS").
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                1.6
+              </p>
+              </td>
+<td>
+              <p>
+                Line Boundaries
+              </p>
+              </td>
+<td>
+              <p>
+                Supported, except that "." matches only one character of
+                "\r\n". Other than that word boundaries match correctly;
+                including not matching in the middle of a "\r\n" sequence.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                1.7
+              </p>
+              </td>
+<td>
+              <p>
+                Code Points
+              </p>
+              </td>
+<td>
+              <p>
+                Supported: provided you use the u32* algorithms, then UTF-8, UTF-16
+                and UTF-32 are all treated as sequences of 32-bit code points.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                2.1
+              </p>
+              </td>
+<td>
+              <p>
+                Canonical Equivalence
+              </p>
+              </td>
+<td>
+              <p>
+                Not supported: it is up to the user of the library to convert all
+                text into the same canonical form as the regular expression.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                2.2
+              </p>
+              </td>
+<td>
+              <p>
+                Default Grapheme Clusters
+              </p>
+              </td>
+<td>
+              <p>
+                Not supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                2.3Default Word Boundaries
+              </p>
+              </td>
+<td>
+              <p>
+                Not supported.
+              </p>
+              </td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td>
+              <p>
+                2.4
+              </p>
+              </td>
+<td>
+              <p>
+                Default Loose Matches
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                2.5
+              </p>
+              </td>
+<td>
+              <p>
+                Named Properties
+              </p>
+              </td>
+<td>
+              <p>
+                Supported: the expression "[[:name:]]" or \N{name} matches
+                the named character "name".
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                2.6
+              </p>
+              </td>
+<td>
+              <p>
+                Wildcard properties
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.1
+              </p>
+              </td>
+<td>
+              <p>
+                Tailored Punctuation.
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.2
+              </p>
+              </td>
+<td>
+              <p>
+                Tailored Grapheme Clusters
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.3
+              </p>
+              </td>
+<td>
+              <p>
+                Tailored Word Boundaries.
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.4
+              </p>
+              </td>
+<td>
+              <p>
+                Tailored Loose Matches
+              </p>
+              </td>
+<td>
+              <p>
+                Partial support: [[=c=]] matches characters with the same primary
+                equivalence class as "c".
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.5
+              </p>
+              </td>
+<td>
+              <p>
+                Tailored Ranges
+              </p>
+              </td>
+<td>
+              <p>
+                Supported: [a-b] matches any character that collates in the range
+                a to b, when the expression is constructed with the collate flag
+                set.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.6
+              </p>
+              </td>
+<td>
+              <p>
+                Context Matches
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.7
+              </p>
+              </td>
+<td>
+              <p>
+                Incremental Matches
+              </p>
+              </td>
+<td>
+              <p>
+                Supported: pass the flag <tt class="computeroutput"><span class="identifier">match_partial</span></tt>
+                to the regex algorithms.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.8
+              </p>
+              </td>
+<td>
+              <p>
+                Unicode Set Sharing
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.9
+              </p>
+              </td>
+<td>
+              <p>
+                Possible Match Sets
+              </p>
+              </td>
+<td>
+              <p>
+                Not supported, however this information is used internally to optimise
+                the matching of regular expressions, and return quickly if no match
+                is possible.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.10
+              </p>
+              </td>
+<td>
+              <p>
+                Folded Matching
+              </p>
+              </td>
+<td>
+              <p>
+                Partial Support: It is possible to achieve a similar effect by using
+                a custom regular expression traits class.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                3.11
+              </p>
+              </td>
+<td>
+              <p>
+                Custom Submatch Evaluation
+              </p>
+              </td>
+<td>
+              <p>
+                Not Supported.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="performance.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="redist.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/background_information/thread_safety.html b/doc/html/boost_regex/background_information/thread_safety.html
new file mode 100644
index 00000000..d76d568d
--- /dev/null
+++ b/doc/html/boost_regex/background_information/thread_safety.html
@@ -0,0 +1,87 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Thread
+      Safety</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../background_information.html" title="Background Information">
+<link rel="prev" href="locale.html" title=" Localization">
+<link rel="next" href="examples.html" title=" Test and
+      Example Programs">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="locale.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="examples.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.background_information.thread_safety"></a><a href="thread_safety.html" title=" Thread
+      Safety"> Thread
+      Safety</a></h3></div></div></div>
+<p>
+        The Boost.Regex library is thread safe when Boost is: you can verify that
+        Boost is in thread safe mode by checking to see if <tt class="computeroutput"><span class="identifier">BOOST_HAS_THREADS</span></tt>
+        is defined: this macro is set automatically by the config system when threading
+        support is turned on in your compiler.
+      </p>
+<p>
+        Class <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>
+        and its typedefs regex and wregex are thread safe, in that compiled regular
+        expressions can safely be shared between threads. The matching algorithms
+        <a href="../ref/regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>,
+        <a href="../ref/regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>,
+        and <a href="../ref/regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a>
+        are all re-entrant and thread safe. Class <a href="../ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> is now thread safe,
+        in that the results of a match can be safely copied from one thread to another
+        (for example one thread may find matches and push <a href="../ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> instances onto a queue,
+        while another thread pops them off the other end), otherwise use a separate
+        instance of <a href="../ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>
+        per thread.
+      </p>
+<p>
+        The <a href="../ref/posix.html" title=" POSIX Compatible C API's">POSIX API functions</a> are
+        all re-entrant and thread safe, regular expressions compiled with regcomp
+        can also be shared between threads.
+      </p>
+<p>
+        The <a href="../ref/deprecated_interfaces/old_regex.html" title=" High
+        Level Class RegEx (Deprecated)">class
+        RegEx</a> is only thread safe if each thread gets its own RegEx instance
+        (apartment threading) - this is a consequence of RegEx handling both compiling
+        and matching regular expressions.
+      </p>
+<p>
+        Finally note that changing the global locale invalidates all compiled regular
+        expressions, therefore calling <tt class="computeroutput"><span class="identifier">set_locale</span></tt>
+        from one thread while another uses regular expressions will produce unpredictable
+        results.
+      </p>
+<p>
+        There is also a requirement that there is only one thread executing prior
+        to the start of main().
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="locale.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="examples.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/captures.html b/doc/html/boost_regex/captures.html
new file mode 100644
index 00000000..5d984fed
--- /dev/null
+++ b/doc/html/boost_regex/captures.html
@@ -0,0 +1,385 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Understanding Marked Sub-Expressions
+    and Captures</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="unicode.html" title=" Unicode and Boost.Regex">
+<link rel="next" href="partial_matches.html" title=" Partial Matches">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="unicode.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="partial_matches.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.captures"></a><a href="captures.html" title=" Understanding Marked Sub-Expressions
+    and Captures"> Understanding Marked Sub-Expressions
+    and Captures</a></h2></div></div></div>
+<p>
+      Captures are the iterator ranges that are "captured" by marked sub-expressions
+      as a regular expression gets matched. Each marked sub-expression can result
+      in more than one capture, if it is matched more than once. This document explains
+      how captures and marked sub-expressions in Boost.Regex are represented and
+      accessed.
+    </p>
+<a name="boost_regex.captures.marked_sub_expressions"></a><h4>
+<a name="id459027"></a>
+      <a href="captures.html#boost_regex.captures.marked_sub_expressions">Marked sub-expressions</a>
+    </h4>
+<p>
+      Every time a Perl regular expression contains a parenthesis group <tt class="computeroutput"><span class="special">()</span></tt>, it spits out an extra field, known as a
+      marked sub-expression, for example the expression:
+    </p>
+<pre class="programlisting">(\w+)\W+(\w+)</pre>
+<p>
+      Has two marked sub-expressions (known as $1 and $2 respectively), in addition
+      the complete match is known as $&amp;, everything before the first match as
+      $`, and everything after the match as $'. So if the above expression is searched
+      for within <tt class="computeroutput"><span class="string">"@abc def--"</span></tt>,
+      then we obtain:
+    </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Sub-expression
+            </p>
+            </th>
+<th>
+            <p>
+              Text found
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              $`
+            </p>
+            </td>
+<td>
+            <p>
+              "@"
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              $&amp;
+            </p>
+            </td>
+<td>
+            <p>
+              "abc def"
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              $1
+            </p>
+            </td>
+<td>
+            <p>
+              "abc"
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              $2
+            </p>
+            </td>
+<td>
+            <p>
+              "def"
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              $'
+            </p>
+            </td>
+<td>
+            <p>
+              "--"
+            </p>
+            </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+      In Boost.Regex all these are accessible via the <a href="ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> class that gets filled
+      in when calling one of the regular expression matching algorithms ( <a href="ref/regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>, <a href="ref/regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>, or <a href="ref/regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>). So given:
+    </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">IteratorType</span><span class="special">&gt;</span> <span class="identifier">m</span><span class="special">;</span>
+</pre>
+<p>
+      The Perl and Boost.Regex equivalents are as follows:
+    </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Perl
+            </p>
+            </th>
+<th>
+            <p>
+              Boost.Regex
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              $`
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">()</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              $&amp;
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">]</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              $n
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="identifier">n</span><span class="special">]</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              $'
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">()</span></tt>
+            </p>
+            </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+      In Boost.Regex each sub-expression match is represented by a <a href="ref/sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> object, this is basically
+      just a pair of iterators denoting the start and end position of the sub-expression
+      match, but there are some additional operators provided so that objects of
+      type <a href="ref/sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+      behave a lot like a <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span></tt>: for example they are implicitly
+      convertible to a <tt class="computeroutput"><span class="identifier">basic_string</span></tt>,
+      they can be compared to a string, added to a string, or streamed out to an
+      output stream.
+    </p>
+<a name="boost_regex.captures.unmatched_sub_expressions"></a><h4>
+<a name="id459648"></a>
+      <a href="captures.html#boost_regex.captures.unmatched_sub_expressions">Unmatched Sub-Expressions</a>
+    </h4>
+<p>
+      When a regular expression match is found there is no need for all of the marked
+      sub-expressions to have participated in the match, for example the expression:
+    </p>
+<pre class="programlisting">(abc)|(def)</pre>
+<p>
+      can match either $1 or $2, but never both at the same time. In Boost.Regex
+      you can determine which sub-expressions matched by accessing the <tt class="computeroutput"><span class="identifier">sub_match</span><span class="special">::</span><span class="identifier">matched</span></tt> data member.
+    </p>
+<a name="boost_regex.captures.repeated_captures"></a><h4>
+<a name="id459714"></a>
+      <a href="captures.html#boost_regex.captures.repeated_captures">Repeated Captures</a>
+    </h4>
+<p>
+      When a marked sub-expression is repeated, then the sub-expression gets "captured"
+      multiple times, however normally only the final capture is available, for example
+      if
+    </p>
+<pre class="programlisting">(?:(\w+)\W+)+</pre>
+<p>
+      is matched against
+    </p>
+<pre class="programlisting">one fine day</pre>
+<p>
+      Then $1 will contain the string "day", and all the previous captures
+      will have been forgotten.
+    </p>
+<p>
+      However, Boost.Regex has an experimental feature that allows all the capture
+      information to be retained - this is accessed either via the <tt class="computeroutput"><span class="identifier">match_results</span><span class="special">::</span><span class="identifier">captures</span></tt> member function or the <tt class="computeroutput"><span class="identifier">sub_match</span><span class="special">::</span><span class="identifier">captures</span></tt> member function. These functions
+      return a container that contains a sequence of all the captures obtained during
+      the regular expression matching. The following example program shows how this
+      information may be used:
+    </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+
+<span class="keyword">void</span> <span class="identifier">print_captures</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">regx</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">text</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="identifier">regx</span><span class="special">);</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">smatch</span> <span class="identifier">what</span><span class="special">;</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Expression:  \""</span> <span class="special">&lt;&lt;</span> <span class="identifier">regx</span> <span class="special">&lt;&lt;</span> <span class="string">"\"\n"</span><span class="special">;</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Text:        \""</span> <span class="special">&lt;&lt;</span> <span class="identifier">text</span> <span class="special">&lt;&lt;</span> <span class="string">"\"\n"</span><span class="special">;</span>
+   <span class="keyword">if</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">text</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_extra</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="keyword">unsigned</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span><span class="special">;</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"** Match found **\n   Sub-Expressions:\n"</span><span class="special">;</span>
+      <span class="keyword">for</span><span class="special">(</span><span class="identifier">i</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">size</span><span class="special">();</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
+         <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"      $"</span> <span class="special">&lt;&lt;</span> <span class="identifier">i</span> <span class="special">&lt;&lt;</span> <span class="string">" = \""</span> <span class="special">&lt;&lt;</span> <span class="identifier">what</span><span class="special">[</span><span class="identifier">i</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="string">"\"\n"</span><span class="special">;</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"   Captures:\n"</span><span class="special">;</span>
+      <span class="keyword">for</span><span class="special">(</span><span class="identifier">i</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">size</span><span class="special">();</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
+      <span class="special">{</span>
+         <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"      $"</span> <span class="special">&lt;&lt;</span> <span class="identifier">i</span> <span class="special">&lt;&lt;</span> <span class="string">" = {"</span><span class="special">;</span>
+         <span class="keyword">for</span><span class="special">(</span><span class="identifier">j</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span> <span class="identifier">j</span> <span class="special">&lt;</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">captures</span><span class="special">(</span><span class="identifier">i</span><span class="special">).</span><span class="identifier">size</span><span class="special">();</span> <span class="special">++</span><span class="identifier">j</span><span class="special">)</span>
+         <span class="special">{</span>
+            <span class="keyword">if</span><span class="special">(</span><span class="identifier">j</span><span class="special">)</span>
+               <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">", "</span><span class="special">;</span>
+            <span class="keyword">else</span>
+               <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">" "</span><span class="special">;</span>
+            <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"\""</span> <span class="special">&lt;&lt;</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">captures</span><span class="special">(</span><span class="identifier">i</span><span class="special">)[</span><span class="identifier">j</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="string">"\""</span><span class="special">;</span>
+         <span class="special">}</span>
+         <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">" }\n"</span><span class="special">;</span>
+      <span class="special">}</span>
+   <span class="special">}</span>
+   <span class="keyword">else</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"** No Match found **\n"</span><span class="special">;</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[])</span>
+<span class="special">{</span>
+   <span class="identifier">print_captures</span><span class="special">(</span><span class="string">"(([[:lower:]]+)|([[:upper:]]+))+"</span><span class="special">,</span> <span class="string">"aBBcccDDDDDeeeeeeee"</span><span class="special">);</span>
+   <span class="identifier">print_captures</span><span class="special">(</span><span class="string">"(.*)bar|(.*)bah"</span><span class="special">,</span> <span class="string">"abcbar"</span><span class="special">);</span>
+   <span class="identifier">print_captures</span><span class="special">(</span><span class="string">"(.*)bar|(.*)bah"</span><span class="special">,</span> <span class="string">"abcbah"</span><span class="special">);</span>
+   <span class="identifier">print_captures</span><span class="special">(</span><span class="string">"^(?:(\\w+)|(?&gt;\\W+))*$"</span><span class="special">,</span> 
+      <span class="string">"now is the time for all good men to come to the aid of the party"</span><span class="special">);</span>
+   <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+<p>
+      Which produces the following output:
+    </p>
+<pre class="programlisting">Expression:  "(([[:lower:]]+)|([[:upper:]]+))+"
+Text:        "aBBcccDDDDDeeeeeeee"
+** Match found **
+   Sub-Expressions:
+      $0 = "aBBcccDDDDDeeeeeeee"
+      $1 = "eeeeeeee"
+      $2 = "eeeeeeee"
+      $3 = "DDDDD"
+   Captures:
+      $0 = { "aBBcccDDDDDeeeeeeee" }
+      $1 = { "a", "BB", "ccc", "DDDDD", "eeeeeeee" }
+      $2 = { "a", "ccc", "eeeeeeee" }
+      $3 = { "BB", "DDDDD" }
+Expression:  "(.*)bar|(.*)bah"
+Text:        "abcbar"
+** Match found **
+   Sub-Expressions:
+      $0 = "abcbar"
+      $1 = "abc"
+      $2 = ""
+   Captures:
+      $0 = { "abcbar" }
+      $1 = { "abc" }
+      $2 = { }
+Expression:  "(.*)bar|(.*)bah"
+Text:        "abcbah"
+** Match found **
+   Sub-Expressions:
+      $0 = "abcbah"
+      $1 = ""
+      $2 = "abc"
+   Captures:
+      $0 = { "abcbah" }
+      $1 = { }
+      $2 = { "abc" }
+Expression:  "^(?:(\w+)|(?&gt;\W+))*$"
+Text:        "now is the time for all good men to come to the aid of the party"
+** Match found **
+   Sub-Expressions:
+      $0 = "now is the time for all good men to come to the aid of the party"
+      $1 = "party"
+   Captures:
+      $0 = { "now is the time for all good men to come to the aid of the party" }
+      $1 = { "now", "is", "the", "time", "for", "all", "good", "men", "to", 
+         "come", "to", "the", "aid", "of", "the", "party" }
+</pre>
+<p>
+      Unfortunately enabling this feature has an impact on performance (even if you
+      don't use it), and a much bigger impact if you do use it, therefore to use
+      this feature you need to:
+    </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+        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.
+      </li>
+<li>
+        Pass the match_extra flag to the particular algorithms where you actually
+        need the captures information (regex_search, regex_match, or regex_iterator).
+      </li>
+</ul></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="unicode.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="partial_matches.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/configuration.html b/doc/html/boost_regex/configuration.html
new file mode 100644
index 00000000..fb86953e
--- /dev/null
+++ b/doc/html/boost_regex/configuration.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Configuration</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="../index.html" title="Boost.Regex">
+<link rel="next" href="configuration/compiler.html" title=" Compiler Setup">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="configuration/compiler.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.configuration"></a><a href="configuration.html" title=" Configuration"> Configuration</a></h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="configuration/compiler.html"> Compiler Setup</a></span></dt>
+<dt><span class="section"><a href="configuration/locale.html"> Locale and traits
+      class selection</a></span></dt>
+<dt><span class="section"><a href="configuration/linkage.html"> Linkage Options</a></span></dt>
+<dt><span class="section"><a href="configuration/algorithm.html"> Algorithm Selection</a></span></dt>
+<dt><span class="section"><a href="configuration/tuning.html"> Algorithm Tuning</a></span></dt>
+</dl></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="configuration/compiler.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/configuration/algorithm.html b/doc/html/boost_regex/configuration/algorithm.html
new file mode 100644
index 00000000..1c8cce84
--- /dev/null
+++ b/doc/html/boost_regex/configuration/algorithm.html
@@ -0,0 +1,91 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Algorithm Selection</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../configuration.html" title=" Configuration">
+<link rel="prev" href="linkage.html" title=" Linkage Options">
+<link rel="next" href="tuning.html" title=" Algorithm Tuning">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="linkage.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tuning.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.configuration.algorithm"></a><a href="algorithm.html" title=" Algorithm Selection"> Algorithm Selection</a></h3></div></div></div>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                macro
+              </p>
+              </th>
+<th>
+              <p>
+                description
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_RECURSIVE
+              </p>
+              </td>
+<td>
+              <p>
+                Tells Boost.Regex to use a stack-recursive matching algorithm. This
+                is generally the fastest option (although there is very little in
+                it), but can cause stack overflow in extreme cases, on Win32 this
+                can be handled safely, but this is not the case on other platforms.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_NON_RECURSIVE
+              </p>
+              </td>
+<td>
+              <p>
+                Tells Boost.Regex to use a non-stack recursive matching algorithm,
+                this can be slightly slower than the alternative, but is always safe
+                no matter how pathological the regular expression. This is the default
+                on non-Win32 platforms.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="linkage.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tuning.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/configuration/compiler.html b/doc/html/boost_regex/configuration/compiler.html
new file mode 100644
index 00000000..6549e66e
--- /dev/null
+++ b/doc/html/boost_regex/configuration/compiler.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Compiler Setup</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../configuration.html" title=" Configuration">
+<link rel="prev" href="../configuration.html" title=" Configuration">
+<link rel="next" href="locale.html" title=" Locale and traits
+      class selection">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../configuration.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="locale.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.configuration.compiler"></a><a href="compiler.html" title=" Compiler Setup"> Compiler Setup</a></h3></div></div></div>
+<p>
+        You shouldn't need to do anything special to configure Boost.Regex for use
+        with your compiler - the <a href="../../../../../config/index.html" target="_top">Boost.Config
+        subsystem</a> should already take care of it, if you do have problems
+        (or you are using a particularly obscure compiler or platform) then <a href="../../../../../config/index.html" target="_top">Boost.Config</a> has a configure script
+        that you can run.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../configuration.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="locale.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/configuration/linkage.html b/doc/html/boost_regex/configuration/linkage.html
new file mode 100644
index 00000000..1711f2fc
--- /dev/null
+++ b/doc/html/boost_regex/configuration/linkage.html
@@ -0,0 +1,90 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Linkage Options</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../configuration.html" title=" Configuration">
+<link rel="prev" href="locale.html" title=" Locale and traits
+      class selection">
+<link rel="next" href="algorithm.html" title=" Algorithm Selection">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="locale.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="algorithm.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.configuration.linkage"></a><a href="linkage.html" title=" Linkage Options"> Linkage Options</a></h3></div></div></div>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                macro
+              </p>
+              </th>
+<th>
+              <p>
+                description
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_DYN_LINK
+              </p>
+              </td>
+<td>
+              <p>
+                For Microsoft and Borland C++ builds, this tells Boost.Regex that
+                it should link to the dll build of the Boost.Regex. By default boost.regex
+                will link to its static library build, even if the dynamic C runtime
+                library is in use.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_NO_LIB
+              </p>
+              </td>
+<td>
+              <p>
+                For Microsoft and Borland C++ builds, this tells Boost.Regex that
+                it should not automatically select the library to link to.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="locale.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="algorithm.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/configuration/locale.html b/doc/html/boost_regex/configuration/locale.html
new file mode 100644
index 00000000..bfab7b14
--- /dev/null
+++ b/doc/html/boost_regex/configuration/locale.html
@@ -0,0 +1,109 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Locale and traits
+      class selection</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../configuration.html" title=" Configuration">
+<link rel="prev" href="compiler.html" title=" Compiler Setup">
+<link rel="next" href="linkage.html" title=" Linkage Options">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="compiler.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="linkage.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.configuration.locale"></a><a href="locale.html" title=" Locale and traits
+      class selection"> Locale and traits
+      class selection</a></h3></div></div></div>
+<p>
+        The following macros (see <a href="../../../../../../boost/regex/user.hpp" target="_top">user.hpp</a>)
+        control how Boost.Regex interacts with the user's locale:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                macro
+              </p>
+              </th>
+<th>
+              <p>
+                description
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_USE_C_LOCALE
+              </p>
+              </td>
+<td>
+              <p>
+                Forces Boost.Regex to use the global C locale in its traits class
+                support: this is now deprecated in favour of the C++ locale.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_USE_CPP_LOCALE
+              </p>
+              </td>
+<td>
+              <p>
+                Forces Boost.Regex to use std::locale in it's default traits class,
+                regular expressions can then be imbued with an instance specific
+                locale. This is the default behaviour on non-Windows platforms.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_NO_W32
+              </p>
+              </td>
+<td>
+              <p>
+                Tells Boost.Regex not to use any Win32 API's even when available
+                (implies BOOST_REGEX_USE_CPP_LOCALE unless BOOST_REGEX_USE_C_LOCALE
+                is set).
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="compiler.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="linkage.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/configuration/tuning.html b/doc/html/boost_regex/configuration/tuning.html
new file mode 100644
index 00000000..05412d1d
--- /dev/null
+++ b/doc/html/boost_regex/configuration/tuning.html
@@ -0,0 +1,152 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Algorithm Tuning</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../configuration.html" title=" Configuration">
+<link rel="prev" href="algorithm.html" title=" Algorithm Selection">
+<link rel="next" href="../install.html" title=" Building and Installing the Library">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="algorithm.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../install.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.configuration.tuning"></a><a href="tuning.html" title=" Algorithm Tuning"> Algorithm Tuning</a></h3></div></div></div>
+<p>
+        The following option applies only if BOOST_REGEX_RECURSIVE is set.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                macro
+              </p>
+              </th>
+<th>
+              <p>
+                description
+              </p>
+              </th>
+</tr></thead>
+<tbody><tr>
+<td>
+              <p>
+                BOOST_REGEX_HAS_MS_STACK_GUARD
+              </p>
+              </td>
+<td>
+              <p>
+                Tells Boost.Regex that Microsoft style __try - __except blocks are
+                supported, and can be used to safely trap stack overflow.
+              </p>
+              </td>
+</tr></tbody>
+</table></div>
+<p>
+        The following options apply only if BOOST_REGEX_NON_RECURSIVE is set.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                macro
+              </p>
+              </th>
+<th>
+              <p>
+                description
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_BLOCKSIZE
+              </p>
+              </td>
+<td>
+              <p>
+                In non-recursive mode, Boost.Regex uses largish blocks of memory
+                to act as a stack for the state machine, the larger the block size
+                then the fewer allocations that will take place. This defaults to
+                4096 bytes, which is large enough to match the vast majority of regular
+                expressions without further allocations, however, you can choose
+                smaller or larger values depending upon your platforms characteristics.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_MAX_BLOCKS
+              </p>
+              </td>
+<td>
+              <p>
+                Tells Boost.Regex how many blocks of size BOOST_REGEX_BLOCKSIZE it
+                is permitted to use. If this value is exceeded then Boost.Regex will
+                stop trying to find a match and throw a std::runtime_error. Defaults
+                to 1024, don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE
+                by much.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                BOOST_REGEX_MAX_CACHE_BLOCKS
+              </p>
+              </td>
+<td>
+              <p>
+                Tells Boost.Regex how many memory blocks to store in it's internal
+                cache - memory blocks are taken from this cache rather than by calling
+                ::operator new. Generally speeking this can be an order of magnitude
+                faster than calling ::opertator new each time a memory block is required,
+                but has the downside that Boost.Regex can end up caching a large
+                chunk of memory (by default up to 16 blocks each of BOOST_REGEX_BLOCKSIZE
+                size). If memory is tight then try defining this to 0 (disables all
+                caching), or if that is too slow, then a value of 1 or 2, may be
+                sufficient. On the other hand, on large multi-processor, multi-threaded
+                systems, you may find that a higher value is in order.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="algorithm.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../configuration.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../install.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/format.html b/doc/html/boost_regex/format.html
new file mode 100644
index 00000000..9efc4524
--- /dev/null
+++ b/doc/html/boost_regex/format.html
@@ -0,0 +1,68 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Search and Replace Format String Syntax</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="syntax/leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule">
+<link rel="next" href="format/sed_format.html" title=" Sed Format String Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax/leftmost_longest_rule.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="format/sed_format.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.format"></a><a href="format.html" title=" Search and Replace Format String Syntax"> Search and Replace Format String Syntax</a></h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="format/sed_format.html"> Sed Format String Syntax</a></span></dt>
+<dt><span class="section"><a href="format/perl_format.html"> Perl Format String Syntax</a></span></dt>
+<dt><span class="section"><a href="format/boost_format_syntax.html"> Boost-Extended
+      Format String Syntax</a></span></dt>
+</dl></div>
+<p>
+      Format strings are used by the algorithm <a href="ref/regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a> and by <a href="ref/match_results.html#boost_regex.match_results_format"><tt class="computeroutput"><span class="identifier">match_results</span><span class="special">&lt;&gt;::</span><span class="identifier">format</span></tt></a>, and are used to transform
+      one string into another.
+    </p>
+<p>
+      There are three kind of format string: <a href="format/sed_format.html" title=" Sed Format String Syntax">Sed</a>,
+      <a href="format/perl_format.html" title=" Perl Format String Syntax">Perl</a> and <a href="format/boost_format_syntax.html" title=" Boost-Extended
+      Format String Syntax">Boost-Extended</a>.
+    </p>
+<p>
+      Alternatively, when the flag <tt class="computeroutput"><span class="identifier">format_literal</span></tt>
+      is passed to one of these functions, then the format string is treated as a
+      string literal, and is copied unchanged to the output.
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax/leftmost_longest_rule.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="format/sed_format.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/format/boost_format_syntax.html b/doc/html/boost_regex/format/boost_format_syntax.html
new file mode 100644
index 00000000..134712c2
--- /dev/null
+++ b/doc/html/boost_regex/format/boost_format_syntax.html
@@ -0,0 +1,403 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Boost-Extended
+      Format String Syntax</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../format.html" title=" Search and Replace Format String Syntax">
+<link rel="prev" href="perl_format.html" title=" Perl Format String Syntax">
+<link rel="next" href="../ref.html" title=" Reference">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="perl_format.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../format.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../ref.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.format.boost_format_syntax"></a><a href="boost_format_syntax.html" title=" Boost-Extended
+      Format String Syntax"> Boost-Extended
+      Format String Syntax</a></h3></div></div></div>
+<p>
+        Boost-Extended format strings treat all characters as literals except for
+        '$', '\', '(', ')', '?', and ':'.
+      </p>
+<a name="boost_regex.format.boost_format_syntax.grouping"></a><h4>
+<a name="id481845"></a>
+        <a href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.grouping">Grouping</a>
+      </h4>
+<p>
+        The characters '(' and ')' perform lexical grouping, so use \( and \) if
+        you want a to output literal parenthesis.
+      </p>
+<a name="boost_regex.format.boost_format_syntax.conditionals"></a><h4>
+<a name="id481877"></a>
+        <a href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.conditionals">Conditionals</a>
+      </h4>
+<p>
+        The character '?' begins a conditional expression, the general form is:
+      </p>
+<p>
+        ?Ntrue-expression:false-expression
+      </p>
+<p>
+        where N is decimal digit.
+      </p>
+<p>
+        If sub-expression N was matched, then true-expression is evaluated and sent
+        to output, otherwise false-expression is evaluated and sent to output.
+      </p>
+<p>
+        You will normally need to surround a conditional-expression with parenthesis
+        in order to prevent ambiguities.
+      </p>
+<p>
+        For example, the format string "(?1foo:bar)" will replace each
+        match found with "foo" if the sub-expression $1 was matched, and
+        with "bar" otherwise.
+      </p>
+<a name="boost_regex.format.boost_format_syntax.placeholder_sequences"></a><h4>
+<a name="id481936"></a>
+        <a href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.placeholder_sequences">Placeholder
+        Sequences</a>
+      </h4>
+<p>
+        Placeholder sequences specify that some part of what matched the regular
+        expression should be sent to output as follows:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Placeholder
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                $&amp;
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs what matched the whole expression.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $`
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the text between the end of the last match found (or the
+                start of the text if no previous match was found), and the start
+                of the current match.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $'
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs all the text following the end of the current match.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $$
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a literal '$'
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $n
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs what matched the n'th sub-expression.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        Any $-placeholder sequence not listed above, results in '$' being treated
+        as a literal.
+      </p>
+<a name="boost_regex.format.boost_format_syntax.escape_sequences"></a><h4>
+<a name="id482109"></a>
+        <a href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.escape_sequences">Escape
+        Sequences</a>
+      </h4>
+<p>
+        An escape character followed by any character x, outputs that character unless
+        x is one of the escape sequences shown below.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                \a
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the bell character: '\a'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \e
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the ANSI escape character (code point 27).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \f
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a form feed character: '\f'
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \n
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a newline character: '\n'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \r
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a carriage return character: '\r'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \t
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a tab character: '\t'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \v
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a vertical tab character: '\v'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \xDD
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the character whose hexadecimal code point is 0xDD
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \x{DDDD}
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the character whose hexadecimal code point is 0xDDDDD
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \cX
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the ANSI escape sequence "escape-X".
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \D
+              </p>
+              </td>
+<td>
+              <p>
+                If D is a decimal digit in the range 1-9, then outputs the text that
+                matched sub-expression D.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \l
+              </p>
+              </td>
+<td>
+              <p>
+                Causes the next character to be outputted, to be output in lower
+                case.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \u
+              </p>
+              </td>
+<td>
+              <p>
+                Causes the next character to be outputted, to be output in upper
+                case.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \L
+              </p>
+              </td>
+<td>
+              <p>
+                Causes all subsequent characters to be output in lower case, until
+                a \E is found.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \U
+              </p>
+              </td>
+<td>
+              <p>
+                Causes all subsequent characters to be output in upper case, until
+                a \E is found.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \E
+              </p>
+              </td>
+<td>
+              <p>
+                Terminates a \L or \U sequence.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="perl_format.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../format.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../ref.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/format/perl_format.html b/doc/html/boost_regex/format/perl_format.html
new file mode 100644
index 00000000..94e2d7f0
--- /dev/null
+++ b/doc/html/boost_regex/format/perl_format.html
@@ -0,0 +1,357 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Perl Format String Syntax</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../format.html" title=" Search and Replace Format String Syntax">
+<link rel="prev" href="sed_format.html" title=" Sed Format String Syntax">
+<link rel="next" href="boost_format_syntax.html" title=" Boost-Extended
+      Format String Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="sed_format.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../format.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="boost_format_syntax.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.format.perl_format"></a><a href="perl_format.html" title=" Perl Format String Syntax"> Perl Format String Syntax</a></h3></div></div></div>
+<p>
+        Perl-style format strings treat all characters as literals except '$' and
+        '\' which start placeholder and escape sequences respectively.
+      </p>
+<p>
+        Placeholder sequences specify that some part of what matched the regular
+        expression should be sent to output as follows:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Placeholder
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                $&amp;
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs what matched the whole expression.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $`
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the text between the end of the last match found (or the
+                start of the text if no previous match was found), and the start
+                of the current match.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $'
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs all the text following the end of the current match.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $$
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a literal '$'
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                $n
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs what matched the n'th sub-expression.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        Any $-placeholder sequence not listed above, results in '$' being treated
+        as a literal.
+      </p>
+<p>
+        An escape character followed by any character x, outputs that character unless
+        x is one of the escape sequences shown below.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                \a
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the bell character: '\a'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \e
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the ANSI escape character (code point 27).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \f
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a form feed character: '\f'
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \n
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a newline character: '\n'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \r
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a carriage return character: '\r'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \t
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a tab character: '\t'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \v
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a vertical tab character: '\v'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \xDD
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the character whose hexadecimal code point is 0xDD
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \x{DDDD}
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the character whose hexadecimal code point is 0xDDDDD
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \cX
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the ANSI escape sequence "escape-X".
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \D
+              </p>
+              </td>
+<td>
+              <p>
+                If D is a decimal digit in the range 1-9, then outputs the text that
+                matched sub-expression D.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \l
+              </p>
+              </td>
+<td>
+              <p>
+                Causes the next character to be outputted, to be output in lower
+                case.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \u
+              </p>
+              </td>
+<td>
+              <p>
+                Causes the next character to be outputted, to be output in upper
+                case.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \L
+              </p>
+              </td>
+<td>
+              <p>
+                Causes all subsequent characters to be output in lower case, until
+                a \E is found.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \U
+              </p>
+              </td>
+<td>
+              <p>
+                Causes all subsequent characters to be output in upper case, until
+                a \E is found.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \E
+              </p>
+              </td>
+<td>
+              <p>
+                Terminates a \L or \U sequence.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="sed_format.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../format.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="boost_format_syntax.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/format/sed_format.html b/doc/html/boost_regex/format/sed_format.html
new file mode 100644
index 00000000..7e79ca46
--- /dev/null
+++ b/doc/html/boost_regex/format/sed_format.html
@@ -0,0 +1,247 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Sed Format String Syntax</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../format.html" title=" Search and Replace Format String Syntax">
+<link rel="prev" href="../format.html" title=" Search and Replace Format String Syntax">
+<link rel="next" href="perl_format.html" title=" Perl Format String Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../format.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../format.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="perl_format.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.format.sed_format"></a><a href="sed_format.html" title=" Sed Format String Syntax"> Sed Format String Syntax</a></h3></div></div></div>
+<p>
+        Sed-style format strings treat all characters as literals except:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                character
+              </p>
+              </th>
+<th>
+              <p>
+                description
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                &amp;
+              </p>
+              </td>
+<td>
+              <p>
+                The ampersand character is replaced in the output stream by the the
+                whole of what matched the regular expression. Use \&amp; to output
+                a literal '&amp;' character.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies an escape sequence.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        An escape character followed by any character x, outputs that character unless
+        x is one of the escape sequences shown below.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                \a
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the bell character: '\a'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \e
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the ANSI escape character (code point 27).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \f
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a form feed character: '\f'
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \n
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a newline character: '\n'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \r
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a carriage return character: '\r'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \t
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a tab character: '\t'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \v
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs a vertical tab character: '\v'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \xDD
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the character whose hexadecimal code point is 0xDD
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \x{DDDD}
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the character whose hexadecimal code point is 0xDDDDD
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \cX
+              </p>
+              </td>
+<td>
+              <p>
+                Outputs the ANSI escape sequence "escape-X".
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \D
+              </p>
+              </td>
+<td>
+              <p>
+                If D is a decimal digit in the range 1-9, then outputs the text that
+                matched sub-expression D.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../format.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../format.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="perl_format.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/install.html b/doc/html/boost_regex/install.html
new file mode 100644
index 00000000..37092833
--- /dev/null
+++ b/doc/html/boost_regex/install.html
@@ -0,0 +1,371 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Building and Installing the Library</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="configuration/tuning.html" title=" Algorithm Tuning">
+<link rel="next" href="introduction_and_overview.html" title="Introduction and
+    Overview">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="configuration/tuning.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="introduction_and_overview.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.install"></a><a href="install.html" title=" Building and Installing the Library"> Building and Installing the Library</a></h2></div></div></div>
+<p>
+      When you extract the library from its zip file, you must preserve its internal
+      directory structure (for example by using the -d option when extracting). If
+      you didn't do that when extracting, then you'd better stop reading this, delete
+      the files you just extracted, and try again!
+    </p>
+<p>
+      This library should not need configuring before use; most popular compilers/standard
+      libraries/platforms are already supported "as is". If you do experience
+      configuration problems, or just want to test the configuration with your compiler,
+      then the process is the same as for all of boost; see the <a href="../../../../config/index.html" target="_top">configuration
+      library documentation</a>.
+    </p>
+<p>
+      The library will encase all code inside namespace boost.
+    </p>
+<p>
+      Unlike some other template libraries, this library consists of a mixture of
+      template code (in the headers) and static code and data (in cpp files). Consequently
+      it is necessary to build the library's support code into a library or archive
+      file before you can use it, instructions for specific platforms are as follows:
+    </p>
+<a name="boost_regex.install.building_with_bjam"></a><h4>
+<a name="id386451"></a>
+      <a href="install.html#boost_regex.install.building_with_bjam">Building with bjam</a>
+    </h4>
+<p>
+      This is now the preferred method for building and installing this library,
+      please refer to the <a href="../../../../../more/getting_started.html" target="_top">getting
+      started guide</a> for more information.
+    </p>
+<a name="boost_regex.install.building_with_unicode_and_icu_support"></a><h4>
+<a name="id386488"></a>
+      <a href="install.html#boost_regex.install.building_with_unicode_and_icu_support">Building
+      With Unicode and ICU Support</a>
+    </h4>
+<p>
+      A default build of this library does not enable Unciode support via ICU. There
+      is no need to enable this support if you don't need it, but if you use ICU
+      for your Unicode support already, and want to work with Unicode-aware regular
+      expressions then read on.
+    </p>
+<p>
+      Most of the information you will need is in the getting started guide, the
+      only additional step you need to take is to tell bjam that you want Boost.Regex
+      to use ICU and optionally to tell bjam where ICU is located.
+    </p>
+<p>
+      If you're building on a Unix-like platform, and ICU is already installed in
+      your compilers search path (with an install prefix of <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span></tt> or <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span></tt>
+      for example), then set the environment variable <tt class="computeroutput"><span class="identifier">HAVE_ICU</span></tt>
+      to enable ICU support. For example you might build with the command line:
+    </p>
+<pre class="programlisting">bjam -sHAVE_ICU=1 --toolset=toolset-name install</pre>
+<p>
+      If ICU is not already in your compiler's path then you need to set the environment
+      variable <tt class="computeroutput"><span class="identifier">ICU_PATH</span></tt> to point
+      to the root directory of your ICU installation, for example if ICU was installed
+      to <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">icu</span><span class="special">/</span><span class="number">3.3</span></tt>
+      you might use:
+    </p>
+<pre class="programlisting">bjam -sICU_PATH=/usr/local/icu/3.3 --toolset=toolset-name install</pre>
+<p>
+      Note that ICU is a C++ library just like Boost is, as such your copy of ICU
+      must have been built with the same C++ compiler (and compiler version) that
+      you are using to build Boost. Boost.Regex will not work correctly unless you
+      ensure that this is the case: it is up to you to ensure that the version of
+      ICU you are using is binary compatible with the toolset you use to build Boost.
+    </p>
+<a name="boost_regex.install.building_via_makefiles"></a><h4>
+<a name="id385474"></a>
+      <a href="install.html#boost_regex.install.building_via_makefiles">Building via makefiles</a>
+    </h4>
+<a name="boost_regex.install.borland_c___builder_"></a><h5>
+<a name="id385498"></a>
+      <a href="install.html#boost_regex.install.borland_c___builder_">Borland C++ Builder:</a>
+    </h5>
+<div class="itemizedlist"><ul type="disc">
+<li>
+        Open up a console window and change to the <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;\</span><span class="identifier">libs</span><span class="special">\</span><span class="identifier">regex</span><span class="special">\</span><span class="identifier">build</span></tt>
+        directory.
+      </li>
+<li>
+        Select the appropriate makefile (bcb4.mak for C++ Builder 4, bcb5.mak for
+        C++ Builder 5, and bcb6.mak for C++ Builder 6).
+      </li>
+<li>
+        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:
+      </li>
+</ul></div>
+<pre class="programlisting">make -fbcb5.mak</pre>
+<p>
+      The build process will build a variety of .lib and .dll files (the exact number
+      depends upon the version of Borland's tools you are using) the .lib and dll
+      files will be in a sub-directory called bcb4 or bcb5 depending upon the makefile
+      used. To install the libraries into your development system use:
+    </p>
+<pre class="programlisting">make -fbcb5.mak install</pre>
+<p>
+      library files will be copied to <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">BCROOT</span><span class="special">&gt;/</span><span class="identifier">lib</span></tt> and the dll's to <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">BCROOT</span><span class="special">&gt;/</span><span class="identifier">bin</span></tt>, where <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">BCROOT</span><span class="special">&gt;</span></tt>
+      corresponds to the install path of your Borland C++ tools.
+    </p>
+<p>
+      You may also remove temporary files created during the build process (excluding
+      lib and dll files) by using:
+    </p>
+<pre class="programlisting">make -fbcb5.mak clean</pre>
+<p>
+      Finally when you use Boost.Regex it is only necessary for you to add the <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;</span></tt> root director to your list of include directories
+      for that project. It is not necessary for you to manually add a .lib file to
+      the project; the headers will automatically select the correct .lib file for
+      your build mode and tell the linker to include it. There is one caveat however:
+      the library can not tell the difference between VCL and non-VCL enabled builds
+      when building a GUI application from the command line, if you build from the
+      command line with the 5.5 command line tools then you must define the pre-processor
+      symbol _NO_VCL in order to ensure that the correct link libraries are selected:
+      the C++ Builder IDE normally sets this automatically. Hint, users of the 5.5
+      command line tools may want to add a -D_NO_VCL to bcc32.cfg in order to set
+      this option permanently.
+    </p>
+<p>
+      If you would prefer to do a dynamic link to the regex libraries when using
+      the dll runtime then define BOOST_REGEX_DYN_LINK (you must do this if you want
+      to use Boost.Regex in multiple dll's), otherwise Boost.Regex will be statically
+      linked by default.
+    </p>
+<p>
+      If you want to suppress automatic linking altogether (and supply your own custom
+      build of the lib) then define BOOST_REGEX_NO_LIB.
+    </p>
+<p>
+      If you are building with C++ Builder 6, you will find that <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>
+      can not be used in a pre-compiled header (the actual problem is in <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">locale</span><span class="special">&gt;</span></tt> which gets included by <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>),
+      if this causes problems for you, then try defining BOOST_NO_STD_LOCALE when
+      building, this will disable some features throughout boost, but may save you
+      a lot in compile times!
+    </p>
+<a name="boost_regex.install.microsoft_visual_c___6__7__7_1_and_8"></a><h4>
+<a name="id456273"></a>
+      <a href="install.html#boost_regex.install.microsoft_visual_c___6__7__7_1_and_8">Microsoft
+      Visual C++ 6, 7, 7.1 and 8</a>
+    </h4>
+<p>
+      You need version 6 or later of MSVC to build this library. If you are using
+      VC5 then you may want to look at one of the previous releases of this library.
+    </p>
+<p>
+      Open up a command prompt, which has the necessary MSVC environment variables
+      defined (for example by using the batch file Vcvars32.bat installed by the
+      Visual Studio installation), and change to the <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;\</span><span class="identifier">libs</span><span class="special">\</span><span class="identifier">regex</span><span class="special">\</span><span class="identifier">build</span> <span class="identifier">directory</span></tt>.
+    </p>
+<p>
+      Select the correct makefile - vc6.mak for "vanilla" Visual C++ 6
+      or vc6-stlport.mak if you are using STLPort.
+    </p>
+<p>
+      Invoke the makefile like this:
+    </p>
+<pre class="programlisting">nmake -fvc6.mak</pre>
+<p>
+      You will now have a collection of lib and dll files in a "vc6" subdirectory,
+      to install these into your development system use:
+    </p>
+<pre class="programlisting">nmake -fvc6.mak install</pre>
+<p>
+      The lib files will be copied to your <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">VC6</span><span class="special">&gt;\</span><span class="identifier">lib</span></tt> directory and the dll files to <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">VC6</span><span class="special">&gt;\</span><span class="identifier">bin</span></tt>, where <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">VC6</span><span class="special">&gt;</span></tt> is
+      the root of your Visual C++ 6 installation.
+    </p>
+<p>
+      You can delete all the temporary files created during the build (excluding
+      lib and dll files) using:
+    </p>
+<pre class="programlisting">nmake -fvc6.mak clean </pre>
+<p>
+      If you want to build with ICU support, then you need to pass the path to your
+      ICU directory to the makefile, for example with:
+    </p>
+<pre class="programlisting">nmake ICU_PATH=c:\open-source\icu -fvc71.mak install</pre>
+<p>
+      Finally when you use Boost.Regex it is only necessary for you to add the <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;</span></tt> root directory to your list of include
+      directories for that project. It is not necessary for you to manually add a
+      .lib file to the project; the headers will automatically select the correct
+      .lib file for your build mode and tell the linker to include it.
+    </p>
+<p>
+      Note that if you want to dynamically link to the regex library when using the
+      dynamic C++ runtime, define BOOST_REGEX_DYN_LINK when building your project.
+    </p>
+<p>
+      If you want to add the source directly to your project then define BOOST_REGEX_NO_LIB
+      to disable automatic library selection.
+    </p>
+<p>
+      There are several important caveats to remember when using Boost.Regex with
+      Microsoft's Compiler:
+    </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+        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 is to use all
+        optimization settings except /Oa. This problem is reported to affect some
+        standard library code as well ( in fact I'm not sure if the problem is with
+        the regex code or the underlying standard library), so it's probably worthwhile
+        applying this workaround in normal practice in any case.
+      </li>
+<li>
+        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.
+      </li>
+<li>
+        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).
+      </li>
+<li>
+        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.
+      </li>
+</ul></div>
+<a name="boost_regex.install.gcc_2_95_and_later_"></a><h5>
+<a name="id456584"></a>
+      <a href="install.html#boost_regex.install.gcc_2_95_and_later_">GCC(2.95 and later)</a>
+    </h5>
+<p>
+      You can build with gcc using the normal boost Jamfile in <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;/</span><span class="identifier">libs</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">build</span></tt>, alternatively
+      there is a conservative makefile for the g++ compiler. From the command prompt
+      change to the &lt;boost&gt;/libs/regex/build directory and type:
+    </p>
+<pre class="programlisting">make -fgcc.mak </pre>
+<p>
+      At the end of the build process you should have a gcc sub-directory containing
+      release and debug versions of the library (libboost_regex.a and libboost_regex_debug.a).
+      When you build projects that use regex++, you will need to add the boost install
+      directory to your list of include paths and add &lt;boost&gt;/libs/regex/build/gcc/libboost_regex.a
+      to your list of library files.
+    </p>
+<p>
+      There is also a makefile to build the library as a shared library:
+    </p>
+<pre class="programlisting">make -fgcc-shared.mak</pre>
+<p>
+      which will build libboost_regex.so and libboost_regex_debug.so.
+    </p>
+<p>
+      Both of the these makefiles support the following environment variables:
+    </p>
+<p>
+      ICU_PATH: tells the makefile to build with Unicode support, set to the path
+      where your ICU installation is located, for example with: make ICU_PATH=/usr/local
+      install -fgcc.mak
+    </p>
+<p>
+      CXXFLAGS: extra compiler options - note that this applies to both the debug
+      and release builds.
+    </p>
+<p>
+      INCLUDES: additional include directories.
+    </p>
+<p>
+      LDFLAGS: additional linker options.
+    </p>
+<p>
+      LIBS: additional library files.
+    </p>
+<p>
+      For the more adventurous there is a configure script in <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;/</span><span class="identifier">libs</span><span class="special">/</span><span class="identifier">config</span></tt>;
+      see the <a href="../../../../config/index.html" target="_top">config library documentation</a>.
+    </p>
+<a name="boost_regex.install.sun_workshop_6_1"></a><h5>
+<a name="id456781"></a>
+      <a href="install.html#boost_regex.install.sun_workshop_6_1">Sun Workshop 6.1</a>
+    </h5>
+<p>
+      There is a makefile for the sun (6.1) compiler (C++ version 3.12). From the
+      command prompt change to the <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;/</span><span class="identifier">libs</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">build</span></tt> directory
+      and type:
+    </p>
+<pre class="programlisting">dmake -f sunpro.mak </pre>
+<p>
+      At the end of the build process you should have a sunpro sub-directory containing
+      single and multithread versions of the library (libboost_regex.a, libboost_regex.so,
+      libboost_regex_mt.a and libboost_regex_mt.so). When you build projects that
+      use Boost.Regex, you will need to add the boost install directory to your list
+      of include paths and add <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">&gt;/</span><span class="identifier">libs</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">build</span><span class="special">/</span><span class="identifier">sunpro</span><span class="special">/</span></tt> to
+      your library search path.
+    </p>
+<p>
+      Both of the these makefiles support the following environment variables:
+    </p>
+<p>
+      CXXFLAGS: extra compiler options - note that this applies to both the single
+      and multithreaded builds.
+    </p>
+<p>
+      INCLUDES: additional include directories.
+    </p>
+<p>
+      LDFLAGS: additional linker options.
+    </p>
+<p>
+      LIBS: additional library files.
+    </p>
+<p>
+      LIBSUFFIX: a suffix to mangle the library name with (defaults to nothing).
+    </p>
+<p>
+      This makefile does not set any architecture specific options like -xarch=v9,
+      you can set these by defining the appropriate macros, for example:
+    </p>
+<pre class="programlisting">dmake CXXFLAGS="-xarch<tt class="literal">v9" LDFLAGS</tt>"-xarch<tt class="literal">v9" LIBSUFFIX</tt>"_v9" -f sunpro.mak</pre>
+<p>
+      will build v9 variants of the regex library named libboost_regex_v9.a etc.
+    </p>
+<a name="boost_regex.install.makefiles_for_other_compilers"></a><h5>
+<a name="id457001"></a>
+      <a href="install.html#boost_regex.install.makefiles_for_other_compilers">Makefiles
+      for Other compilers</a>
+    </h5>
+<p>
+      There is a generic makefile (generic.mak ) provided in <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">-</span><span class="identifier">root</span><span class="special">&gt;/</span><span class="identifier">libs</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">build</span></tt> - see that makefile for details of
+      environment variables that need to be set before use.
+    </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="configuration/tuning.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="introduction_and_overview.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/introduction_and_overview.html b/doc/html/boost_regex/introduction_and_overview.html
new file mode 100644
index 00000000..ad97c7eb
--- /dev/null
+++ b/doc/html/boost_regex/introduction_and_overview.html
@@ -0,0 +1,220 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Introduction and
+    Overview</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="install.html" title=" Building and Installing the Library">
+<link rel="next" href="unicode.html" title=" Unicode and Boost.Regex">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="install.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.introduction_and_overview"></a><a href="introduction_and_overview.html" title="Introduction and
+    Overview">Introduction and
+    Overview</a></h2></div></div></div>
+<p>
+      Regular expressions are a form of pattern-matching that are often used in text
+      processing; many users will be familiar with the Unix utilities grep, sed and
+      awk, and the programming language Perl, each of which make extensive use of
+      regular expressions. Traditionally C++ users have been limited to the POSIX
+      C API's for manipulating regular expressions, and while Boost.Regex does provide
+      these API's, they do not represent the best way to use the library. For example
+      Boost.Regex can cope with wide character strings, or search and replace operations
+      (in a manner analogous to either sed or Perl), something that traditional C
+      libraries can not do.
+    </p>
+<p>
+      The class <a href="ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>
+      is the key class in this library; it represents a "machine readable"
+      regular expression, and is very closely modeled on <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span></tt>,
+      think of it as a string plus the actual state-machine required by the regular
+      expression algorithms. Like <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span></tt>
+      there are two typedefs that are almost always the means by which this class
+      is referenced:
+    </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> 
+         <span class="keyword">class</span> <span class="identifier">traits</span> <span class="special">=</span> <span class="identifier">regex_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">basic_regex</span><span class="special">;</span>
+
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">regex</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="keyword">wchar_t</span><span class="special">&gt;</span> <span class="identifier">wregex</span><span class="special">;</span>
+
+<span class="special">}</span>
+</pre>
+<p>
+      To see how this library can be used, imagine that we are writing a credit card
+      processing application. Credit card numbers generally come as a string of 16-digits,
+      separated into groups of 4-digits, and separated by either a space or a hyphen.
+      Before storing a credit card number in a database (not necessarily something
+      your customers will appreciate!), we may want to verify that the number is
+      in the correct format. To match any digit we could use the regular expression
+      [0-9], however ranges of characters like this are actually locale dependent.
+      Instead we should use the POSIX standard form [[:digit:]], or the Boost.Regex
+      and Perl shorthand for this \d (note that many older libraries tended to be
+      hard-coded to the C-locale, consequently this was not an issue for them). That
+      leaves us with the following regular expression to validate credit card number
+      formats:
+    </p>
+<pre class="programlisting">(\d{4}<span class="strikethrough"></span>){3}\d{4}</pre>
+<p>
+      Here the parenthesis act to group (and mark for future reference) sub-expressions,
+      and the {4} means "repeat exactly 4 times". This is an example of
+      the extended regular expression syntax used by Perl, awk and egrep. Boost.Regex
+      also supports the older "basic" syntax used by sed and grep, but
+      this is generally less useful, unless you already have some basic regular expressions
+      that you need to reuse.
+    </p>
+<p>
+      Now let's take that expression and place it in some C++ code to validate the
+      format of a credit card number:
+    </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="identifier">validate_card_format</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"(\\d{4}[- ]){3}\\d{4}"</span><span class="special">);</span>
+   <span class="keyword">return</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">e</span><span class="special">);</span>
+<span class="special">}</span>
+</pre>
+<p>
+      Note how we had to add some extra escapes to the expression: remember that
+      the escape is seen once by the C++ compiler, before it gets to be seen by the
+      regular expression engine, consequently escapes in regular expressions have
+      to be doubled up when embedding them in C/C++ code. Also note that all the
+      examples assume that your compiler supports argument-dependent-lookup lookup,
+      if yours doesn't (for example VC6), then you will have to add some <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span></tt> prefixes
+      to some of the function calls in the examples.
+    </p>
+<p>
+      Those of you who are familiar with credit card processing, will have realized
+      that while the format used above is suitable for human readable card numbers,
+      it does not represent the format required by online credit card systems; these
+      require the number as a string of 16 (or possibly 15) digits, without any intervening
+      spaces. What we need is a means to convert easily between the two formats,
+      and this is where search and replace comes in. Those who are familiar with
+      the utilities sed and Perl will already be ahead here; we need two strings
+      - one a regular expression - the other a "format string" that provides
+      a description of the text to replace the match with. In Boost.Regex this search
+      and replace operation is performed with the algorithm <a href="ref/regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a>, for our credit card
+      example we can write two algorithms like this to provide the format conversions:
+    </p>
+<pre class="programlisting">
+<span class="comment">// match any format with the regular expression:
+</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z"</span><span class="special">);</span>
+<span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">machine_format</span><span class="special">(</span><span class="string">"\\1\\2\\3\\4"</span><span class="special">);</span>
+<span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">human_format</span><span class="special">(</span><span class="string">"\\1-\\2-\\3-\\4"</span><span class="special">);</span>
+
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">machine_readable_card_number</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">return</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">machine_format</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_default</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">format_sed</span><span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">human_readable_card_number</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">return</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">human_format</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_default</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">format_sed</span><span class="special">);</span>
+<span class="special">}</span>
+</pre>
+<p>
+      Here we've used marked sub-expressions in the regular expression to split out
+      the four parts of the card number as separate fields, the format string then
+      uses the sed-like syntax to replace the matched text with the reformatted version.
+    </p>
+<p>
+      In the examples above, we haven't directly manipulated the results of a regular
+      expression match, however in general the result of a match contains a number
+      of sub-expression matches in addition to the overall match. When the library
+      needs to report a regular expression match it does so using an instance of
+      the class <a href="ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>,
+      as before there are typedefs of this class for the most common cases:
+    </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span>
+
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span>                  <span class="identifier">cmatch</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span>               <span class="identifier">wcmatch</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span>  <span class="identifier">smatch</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">wstring</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> <span class="identifier">wsmatch</span><span class="special">;</span> 
+
+<span class="special">}</span>
+</pre>
+<p>
+      The algorithms <a href="ref/regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>
+      and <a href="ref/regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>
+      make use of <a href="ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>
+      to report what matched; the difference between these algorithms is that <a href="ref/regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>
+      will only find matches that consume <span class="emphasis"><em>all</em></span> of the input text,
+      where as <a href="ref/regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>
+      will search for a match anywhere within the text being matched.
+    </p>
+<p>
+      Note that these algorithms are not restricted to searching regular C-strings,
+      any bidirectional iterator type can be searched, allowing for the possibility
+      of seamlessly searching almost any kind of data.
+    </p>
+<p>
+      For search and replace operations, in addition to the algorithm <a href="ref/regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a> that we have already
+      seen, the <a href="ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>
+      class has a <tt class="computeroutput"><span class="identifier">format</span></tt> member that
+      takes the result of a match and a format string, and produces a new string
+      by merging the two.
+    </p>
+<p>
+      For iterating through all occurences of an expression within a text, there
+      are two iterator types: <a href="ref/regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> will enumerate over
+      the <a href="ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>
+      objects found, while <a href="ref/regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> will enumerate
+      a series of strings (similar to perl style split operations).
+    </p>
+<p>
+      For those that dislike templates, there is a high level wrapper class <a href="ref/deprecated_interfaces/old_regex.html" title=" High
+        Level Class RegEx (Deprecated)"><tt class="computeroutput"><span class="identifier">RegEx</span></tt></a>
+      that is an encapsulation of the lower level template code - it provides a simplified
+      interface for those that don't need the full power of the library, and supports
+      only narrow characters, and the "extended" regular expression syntax.
+      This class is now deprecated as it does not form part of the regular expressions
+      C++ standard library proposal.
+    </p>
+<p>
+      The POSIX API functions: <a href="ref/posix.html#boost_regex.ref.posix.regcomp"><tt class="computeroutput"><span class="identifier">regcomp</span></tt></a>, <a href="ref/posix.html#boost_regex.ref.posix.regexec"><tt class="computeroutput"><span class="identifier">regexec</span></tt></a>, <a href="ref/posix.html#boost_regex.ref.posix.regfree"><tt class="computeroutput"><span class="identifier">regfree</span></tt></a> and [regerr], are available
+      in both narrow character and Unicode versions, and are provided for those who
+      need compatibility with these API's.
+    </p>
+<p>
+      Finally, note that the library now has <a href="background_information/locale.html" title=" Localization">run-time
+      localization support</a>, and recognizes the full POSIX regular expression
+      syntax - including advanced features like multi-character collating elements
+      and equivalence classes - as well as providing compatibility with other regular
+      expression libraries including GNU and BSD4 regex packages, PCRE and Perl 5.
+    </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="install.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/partial_matches.html b/doc/html/boost_regex/partial_matches.html
new file mode 100644
index 00000000..b5befab7
--- /dev/null
+++ b/doc/html/boost_regex/partial_matches.html
@@ -0,0 +1,310 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Partial Matches</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="captures.html" title=" Understanding Marked Sub-Expressions
+    and Captures">
+<link rel="next" href="syntax.html" title=" Regular Expression Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="captures.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.partial_matches"></a><a href="partial_matches.html" title=" Partial Matches"> Partial Matches</a></h2></div></div></div>
+<p>
+      The <a href="ref/match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>
+      <tt class="computeroutput"><span class="identifier">match_partial</span></tt> can be passed
+      to the following algorithms: <a href="ref/regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>, <a href="ref/regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>, and <a href="ref/deprecated_interfaces/regex_grep.html" title="
+        regex_grep (Deprecated)"><tt class="computeroutput"><span class="identifier">regex_grep</span></tt></a>, and used with the iterator
+      <a href="ref/regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>.
+      When used it indicates that partial as well as full matches should be found.
+      A partial match is one that matched one or more characters at the end of the
+      text input, but did not match all of the regular expression (although it may
+      have done so had more input been available). Partial matches are typically
+      used when either validating data input (checking each character as it is entered
+      on the keyboard), or when searching texts that are either too long to load
+      into memory (or even into a memory mapped file), or are of indeterminate length
+      (for example the source may be a socket or similar). Partial and full matches
+      can be differentiated as shown in the following table (the variable M represents
+      an instance of <a href="ref/match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> as filled in by <a href="ref/regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>,
+      <a href="ref/regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>
+      or <a href="ref/deprecated_interfaces/regex_grep.html" title="
+        regex_grep (Deprecated)"><tt class="computeroutput"><span class="identifier">regex_grep</span></tt></a>):
+    </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+            </p>
+            </th>
+<th>
+            <p>
+              Result
+            </p>
+            </th>
+<th>
+            <p>
+              M[0].matched
+            </p>
+            </th>
+<th>
+            <p>
+              M[0].first
+            </p>
+            </th>
+<th>
+            <p>
+              M[0].second
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              No match
+            </p>
+            </td>
+<td>
+            <p>
+              False
+            </p>
+            </td>
+<td>
+            <p>
+              Undefined
+            </p>
+            </td>
+<td>
+            <p>
+              Undefined
+            </p>
+            </td>
+<td>
+            <p>
+              Undefined
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              Partial match
+            </p>
+            </td>
+<td>
+            <p>
+              True
+            </p>
+            </td>
+<td>
+            <p>
+              False
+            </p>
+            </td>
+<td>
+            <p>
+              Start of partial match.
+            </p>
+            </td>
+<td>
+            <p>
+              End of partial match (end of text).
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              Full match
+            </p>
+            </td>
+<td>
+            <p>
+              True
+            </p>
+            </td>
+<td>
+            <p>
+              True
+            </p>
+            </td>
+<td>
+            <p>
+              Start of full match.
+            </p>
+            </td>
+<td>
+            <p>
+              End of full match.
+            </p>
+            </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+      Be aware that using partial matches can sometimes result in somewhat imperfect
+      behavior:
+    </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+        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.
+      </li>
+<li>
+        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".
+        It's more efficient to work this way, but may not be the behavior you want
+        in all situations.
+      </li>
+</ul></div>
+<p>
+      The following example tests to see whether the text could be a valid credit
+      card number, as the user presses a key, the character entered would be added
+      to the string being built up, and passed to <tt class="computeroutput"><span class="identifier">is_possible_card_number</span></tt>.
+      If this returns true then the text could be a valid card number, so the user
+      interface's OK button would be enabled. If it returns false, then this is not
+      yet a valid card number, but could be with more input, so the user interface
+      would disable the OK button. Finally, if the procedure throws an exception
+      the input could never become a valid number, and the inputted character must
+      be discarded, and a suitable error indication displayed to the user.
+    </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})"</span><span class="special">);</span>
+
+<span class="keyword">bool</span> <span class="identifier">is_possible_card_number</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">input</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">//
+</span>   <span class="comment">// return false for partial match, true for full match, or throw for
+</span>   <span class="comment">// impossible match based on what we have so far...
+</span>   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> <span class="identifier">what</span><span class="special">;</span>
+   <span class="keyword">if</span><span class="special">(</span><span class="number">0</span> <span class="special">==</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">input</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_default</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_partial</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="comment">// the input so far could not possibly be valid so reject it:
+</span>      <span class="keyword">throw</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span><span class="special">(</span>
+         <span class="string">"Invalid data entered - this could not possibly be a valid card number"</span><span class="special">);</span>
+   <span class="special">}</span>
+   <span class="comment">// OK so far so good, but have we finished?
+</span>   <span class="keyword">if</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">matched</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="comment">// excellent, we have a result:
+</span>      <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
+   <span class="special">}</span>
+   <span class="comment">// what we have so far is only a partial match...
+</span>   <span class="keyword">return</span> <span class="keyword">false</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+<p>
+      In the following example, text input is taken from a stream containing an unknown
+      amount of text; this example simply counts the number of html tags encountered
+      in the stream. The text is loaded into a buffer and searched a part at a time,
+      if a partial match was encountered, then the partial match gets searched a
+      second time as the start of the next batch of text:
+    </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">sstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="comment">// match some kind of html tag:
+</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"&lt;[^&gt;]*&gt;"</span><span class="special">);</span>
+<span class="comment">// count how many:
+</span><span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">tags</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+
+<span class="keyword">void</span> <span class="identifier">search</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">istream</span><span class="special">&amp;</span> <span class="identifier">is</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// buffer we'll be searching in:
+</span>   <span class="keyword">char</span> <span class="identifier">buf</span><span class="special">[</span><span class="number">4096</span><span class="special">];</span>
+   <span class="comment">// saved position of end of partial match:
+</span>   <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">next_pos</span> <span class="special">=</span> <span class="identifier">buf</span> <span class="special">+</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">buf</span><span class="special">);</span>
+   <span class="comment">// flag to indicate whether there is more input to come:
+</span>   <span class="keyword">bool</span> <span class="identifier">have_more</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">;</span>
+
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">have_more</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="comment">// how much do we copy forward from last try:
+</span>      <span class="keyword">unsigned</span> <span class="identifier">leftover</span> <span class="special">=</span> <span class="special">(</span><span class="identifier">buf</span> <span class="special">+</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">buf</span><span class="special">))</span> <span class="special">-</span> <span class="identifier">next_pos</span><span class="special">;</span>
+      <span class="comment">// and how much is left to fill:
+</span>      <span class="keyword">unsigned</span> <span class="identifier">size</span> <span class="special">=</span> <span class="identifier">next_pos</span> <span class="special">-</span> <span class="identifier">buf</span><span class="special">;</span>
+      <span class="comment">// copy forward whatever we have left:
+</span>      <span class="identifier">std</span><span class="special">::</span><span class="identifier">memmove</span><span class="special">(</span><span class="identifier">buf</span><span class="special">,</span> <span class="identifier">next_pos</span><span class="special">,</span> <span class="identifier">leftover</span><span class="special">);</span>
+      <span class="comment">// fill the rest from the stream:
+</span>      <span class="identifier">is</span><span class="special">.</span><span class="identifier">read</span><span class="special">(</span><span class="identifier">buf</span> <span class="special">+</span> <span class="identifier">leftover</span><span class="special">,</span> <span class="identifier">size</span><span class="special">);</span>
+      <span class="keyword">unsigned</span> <span class="identifier">read</span> <span class="special">=</span> <span class="identifier">is</span><span class="special">.</span><span class="identifier">gcount</span><span class="special">();</span>
+      <span class="comment">// check to see if we've run out of text:
+</span>      <span class="identifier">have_more</span> <span class="special">=</span> <span class="identifier">read</span> <span class="special">==</span> <span class="identifier">size</span><span class="special">;</span>
+      <span class="comment">// reset next_pos:
+</span>      <span class="identifier">next_pos</span> <span class="special">=</span> <span class="identifier">buf</span> <span class="special">+</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">buf</span><span class="special">);</span>
+      <span class="comment">// and then iterate:
+</span>      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">cregex_iterator</span> <span class="identifier">a</span><span class="special">(</span>
+         <span class="identifier">buf</span><span class="special">,</span> 
+         <span class="identifier">buf</span> <span class="special">+</span> <span class="identifier">read</span> <span class="special">+</span> <span class="identifier">leftover</span><span class="special">,</span> 
+         <span class="identifier">e</span><span class="special">,</span> 
+         <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_default</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_partial</span><span class="special">);</span> 
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">cregex_iterator</span> <span class="identifier">b</span><span class="special">;</span>
+
+      <span class="keyword">while</span><span class="special">(</span><span class="identifier">a</span> <span class="special">!=</span> <span class="identifier">b</span><span class="special">)</span>
+      <span class="special">{</span>
+         <span class="keyword">if</span><span class="special">((*</span><span class="identifier">a</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">matched</span> <span class="special">==</span> <span class="keyword">false</span><span class="special">)</span>
+         <span class="special">{</span>
+            <span class="comment">// Partial match, save position and break:
+</span>            <span class="identifier">next_pos</span> <span class="special">=</span> <span class="special">(*</span><span class="identifier">a</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span><span class="special">;</span>
+            <span class="keyword">break</span><span class="special">;</span>
+         <span class="special">}</span>
+         <span class="keyword">else</span>
+         <span class="special">{</span>
+            <span class="comment">// full match:
+</span>            <span class="special">++</span><span class="identifier">tags</span><span class="special">;</span>
+         <span class="special">}</span>
+         
+         <span class="comment">// move to next match:
+</span>         <span class="special">++</span><span class="identifier">a</span><span class="special">;</span>
+      <span class="special">}</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="captures.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref.html b/doc/html/boost_regex/ref.html
new file mode 100644
index 00000000..5bf87bab
--- /dev/null
+++ b/doc/html/boost_regex/ref.html
@@ -0,0 +1,143 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Reference</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="format/boost_format_syntax.html" title=" Boost-Extended
+      Format String Syntax">
+<link rel="next" href="ref/basic_regex.html" title=" basic_regex">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="format/boost_format_syntax.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="ref/basic_regex.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.ref"></a><a href="ref.html" title=" Reference"> Reference</a></h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="ref/basic_regex.html"> basic_regex</a></span></dt>
+<dt><span class="section"><a href="ref/match_results.html"> match_results</a></span></dt>
+<dt><span class="section"><a href="ref/sub_match.html"> sub_match</a></span></dt>
+<dt><span class="section"><a href="ref/regex_match.html"> regex_match</a></span></dt>
+<dt><span class="section"><a href="ref/regex_search.html"> regex_search</a></span></dt>
+<dt><span class="section"><a href="ref/regex_replace.html"> regex_replace</a></span></dt>
+<dt><span class="section"><a href="ref/regex_iterator.html"> regex_iterator</a></span></dt>
+<dt><span class="section"><a href="ref/regex_token_iterator.html"> regex_token_iterator</a></span></dt>
+<dt><span class="section"><a href="ref/bad_expression.html"> bad_expression</a></span></dt>
+<dt><span class="section"><a href="ref/syntax_option_type.html"> syntax_option_type</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref/syntax_option_type/syntax_option_type_synopsis.html">
+        syntax_option_type Synopsis</a></span></dt>
+<dt><span class="section"><a href="ref/syntax_option_type/syntax_option_type_overview.html">
+        Overview of syntax_option_type</a></span></dt>
+<dt><span class="section"><a href="ref/syntax_option_type/syntax_option_type_perl.html">
+        Options for Perl Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="ref/syntax_option_type/syntax_option_type_extended.html">
+        Options for POSIX Extended Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="ref/syntax_option_type/syntax_option_type_basic.html">
+        Options for POSIX Basic Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="ref/syntax_option_type/syntax_option_type_literal.html">
+        Options for Literal Strings</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="ref/match_flag_type.html"> match_flag_type</a></span></dt>
+<dt><span class="section"><a href="ref/error_type.html"> error_type</a></span></dt>
+<dt><span class="section"><a href="ref/regex_traits.html"> regex_traits</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings.html"> Interfacing With Non-Standard
+      String Types</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref/non_std_strings/icu.html"> Working With
+        Unicode and ICU String Types</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref/non_std_strings/icu/intro.html"> Introduction
+          to using Regex with ICU</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings/icu/unicode_types.html">
+          Unicode regular expression types</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings/icu/unicode_algo.html">
+          Unicode Regular Expression Algorithms</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings/icu/unicode_iter.html">
+          Unicode Aware Regex Iterators</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="ref/non_std_strings/mfc_strings.html"> Using
+        Boost Regex With MFC Strings</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref/non_std_strings/mfc_strings/mfc_intro.html">
+          Introduction to Boost.Regex and MFC Strings</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings/mfc_strings/mfc_regex_types.html">
+          Regex Types Used With MFC Strings</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings/mfc_strings/mfc_regex_create.html">
+          Regular Expression Creation From an MFC String</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings/mfc_strings/mfc_algo.html">
+          Overloaded Algorithms For MFC String Types</a></span></dt>
+<dt><span class="section"><a href="ref/non_std_strings/mfc_strings/mfc_iter.html">
+          Iterating Over the Matches Within An MFC String</a></span></dt>
+</dl></dd>
+</dl></dd>
+<dt><span class="section"><a href="ref/posix.html"> POSIX Compatible C API's</a></span></dt>
+<dt><span class="section"><a href="ref/concepts.html"> Concepts</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref/concepts/charT_concept.html"> charT Requirements</a></span></dt>
+<dt><span class="section"><a href="ref/concepts/traits_concept.html"> Traits Class
+        Requirements</a></span></dt>
+<dt><span class="section"><a href="ref/concepts/iterator_concepts.html"> Iterator
+        Rrequirements</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="ref/deprecated_interfaces.html">Deprecated Interfaces</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="ref/deprecated_interfaces/regex_format.html">
+        regex_format (Deprecated)</a></span></dt>
+<dt><span class="section"><a href="ref/deprecated_interfaces/regex_grep.html">
+        regex_grep (Deprecated)</a></span></dt>
+<dt><span class="section"><a href="ref/deprecated_interfaces/regex_split.html">
+        regex_split (deprecated)</a></span></dt>
+<dt><span class="section"><a href="ref/deprecated_interfaces/old_regex.html"> High
+        Level Class RegEx (Deprecated)</a></span></dt>
+</dl></dd>
+</dl></div>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="format/boost_format_syntax.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="ref/basic_regex.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/bad_expression.html b/doc/html/boost_regex/ref/bad_expression.html
new file mode 100644
index 00000000..53c10241
--- /dev/null
+++ b/doc/html/boost_regex/ref/bad_expression.html
@@ -0,0 +1,106 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> bad_expression</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="regex_token_iterator.html" title=" regex_token_iterator">
+<link rel="next" href="syntax_option_type.html" title=" syntax_option_type">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_token_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.bad_expression"></a><a href="bad_expression.html" title=" bad_expression"> bad_expression</a></h3></div></div></div>
+<a name="boost_regex.ref.bad_expression.synopsis"></a><h4>
+<a name="id563003"></a>
+        <a href="bad_expression.html#boost_regex.ref.bad_expression.synopsis">Synopsis</a>
+      </h4>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">pattern_except</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+        The class <tt class="computeroutput"><span class="identifier">regex_error</span></tt> defines
+        the type of objects thrown as exceptions to report errors during the conversion
+        from a string representing a regular expression to a finite state machine.
+      </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span>
+
+<span class="keyword">class</span> <span class="identifier">regex_error</span> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+   <span class="keyword">explicit</span> <span class="identifier">regex_error</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">error_type</span> <span class="identifier">err</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ptrdiff_t</span> <span class="identifier">pos</span><span class="special">);</span>
+   <span class="keyword">explicit</span> <span class="identifier">regex_error</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">error_type</span> <span class="identifier">err</span><span class="special">);</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">error_type</span> <span class="identifier">code</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">ptrdiff_t</span> <span class="identifier">position</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+<span class="special">};</span>
+
+<span class="keyword">typedef</span> <span class="identifier">regex_error</span> <span class="identifier">bad_pattern</span><span class="special">;</span> <span class="comment">// for backwards compatibility
+</span><span class="keyword">typedef</span> <span class="identifier">regex_error</span> <span class="identifier">bad_expression</span><span class="special">;</span> <span class="comment">// for backwards compatibility
+</span>
+<span class="special">}</span> <span class="comment">// namespace boost
+</span></pre>
+<a name="boost_regex.ref.bad_expression.description"></a><h4>
+<a name="id563510"></a>
+        <a href="bad_expression.html#boost_regex.ref.bad_expression.description">Description</a>
+      </h4>
+<pre class="programlisting">
+<span class="identifier">regex_error</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">error_type</span> <span class="identifier">err</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ptrdiff_t</span> <span class="identifier">pos</span><span class="special">);</span>
+<span class="identifier">regex_error</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">error_type</span> <span class="identifier">err</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects:</b></span> Constructs an object of class regex_error.
+      </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">error_type</span> <span class="identifier">code</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects:</b></span> returns the error code that represents
+        parsing error that occurred.
+      </p>
+<pre class="programlisting">
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">ptrdiff_t</span> <span class="identifier">position</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects:</b></span> returns the location in the expression
+        where parsing stopped.
+      </p>
+<p>
+        Footnotes: the choice of <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        as the base class for <tt class="computeroutput"><span class="identifier">regex_error</span></tt>
+        is moot; depending upon how the library is used exceptions may be either
+        logic errors (programmer supplied expressions) or run time errors (user supplied
+        expressions). The library previously used <tt class="computeroutput"><span class="identifier">bad_pattern</span></tt>
+        and <tt class="computeroutput"><span class="identifier">bad_expression</span></tt> for errors,
+        these have been replaced by the single class <tt class="computeroutput"><span class="identifier">regex_error</span></tt>
+        to keep the library in synchronization with the <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf" target="_top">Technical
+        Report on C++ Library Extensions</a>.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_token_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/basic_regex.html b/doc/html/boost_regex/ref/basic_regex.html
new file mode 100644
index 00000000..905f35e0
--- /dev/null
+++ b/doc/html/boost_regex/ref/basic_regex.html
@@ -0,0 +1,1356 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> basic_regex</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="../ref.html" title=" Reference">
+<link rel="next" href="match_results.html" title=" match_results">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../ref.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="match_results.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.basic_regex"></a><a href="basic_regex.html" title=" basic_regex"> basic_regex</a></h3></div></div></div>
+<a name="boost_regex.ref.basic_regex.synopsis"></a><h4>
+<a name="id482525"></a>
+        <a href="basic_regex.html#boost_regex.ref.basic_regex.synopsis">Synopsis</a>
+      </h4>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+        The template class <tt class="computeroutput"><span class="identifier">basic_regex</span></tt>
+        encapsulates regular expression parsing and compilation. The class takes
+        two template parameters:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+<tt class="computeroutput"><span class="identifier">charT</span></tt>: determines the character
+          type, i.e. either <tt class="computeroutput"><span class="keyword">char</span></tt> or
+          <tt class="computeroutput"><span class="keyword">wchar_t</span></tt>; see <a href="concepts/charT_concept.html" title=" charT Requirements">charT
+          concept</a>.
+        </li>
+<li>
+<tt class="computeroutput"><span class="identifier">traits</span></tt>: determines the
+          behavior of the character type, for example which character class names
+          are recognized. A default traits class is provided: <tt class="computeroutput"><span class="identifier">regex_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span></tt>. See also <a href="concepts/traits_concept.html" title=" Traits Class
+        Requirements">traits
+          concept</a>.
+        </li>
+</ul></div>
+<p>
+        For ease of use there are two typedefs that define the two standard <tt class="computeroutput"><span class="identifier">basic_regex</span></tt> instances, unless you want
+        to use custom traits classes or non-standard character types (for example
+        see <a href="non_std_strings/icu.html" title=" Working With
+        Unicode and ICU String Types">unicode support</a>),
+        you won't need to use anything other than these:
+      </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span> <span class="special">=</span> <span class="identifier">regex_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span>  <span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">basic_regex</span><span class="special">;</span>
+
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;</span>      <span class="identifier">regex</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="keyword">wchar_t</span><span class="special">&gt;</span>   <span class="identifier">wregex</span><span class="special">;</span>
+
+<span class="special">}</span>
+</pre>
+<p>
+        The definition of <tt class="computeroutput"><span class="identifier">basic_regex</span></tt>
+        follows: it is based very closely on class <tt class="computeroutput"><span class="identifier">basic_string</span></tt>,
+        and fulfils the requirements for a constant-container of <tt class="computeroutput"><span class="identifier">charT</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span>  <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span> <span class="special">=</span> <span class="identifier">regex_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">basic_regex</span> <span class="special">{</span>
+   <span class="keyword">public</span><span class="special">:</span>          
+   <span class="comment">// types:
+</span>   <span class="keyword">typedef</span>          <span class="identifier">charT</span>                                <span class="identifier">value_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">implementation</span><span class="special">-</span><span class="identifier">specific</span>              <span class="identifier">const_iterator</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">const_iterator</span>                       <span class="identifier">iterator</span><span class="special">;</span>                 
+   <span class="keyword">typedef</span>          <span class="identifier">charT</span><span class="special">&amp;</span>                               <span class="identifier">reference</span><span class="special">;</span>           
+   <span class="keyword">typedef</span>          <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">&amp;</span>                         <span class="identifier">const_reference</span><span class="special">;</span>           
+   <span class="keyword">typedef</span>          <span class="identifier">std</span><span class="special">::</span><span class="identifier">ptrdiff_t</span>                       <span class="identifier">difference_type</span><span class="special">;</span>                 
+   <span class="keyword">typedef</span>          <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span>                          <span class="identifier">size_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a>  <span class="identifier">flag_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">locale_type</span>                  <span class="identifier">locale_type</span><span class="special">;</span>
+
+   <span class="comment">// constants:
+</span>   <span class="comment">// main option selection:
+</span>   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">normal</span>          
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">ECMAScript</span>      
+                                                <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">JavaScript</span>      
+                                                <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">JScript</span>         
+                                                <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">basic</span>           
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">basic</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">extended</span>        
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">extended</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">awk</span>             
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">awk</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">grep</span>            
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">grep</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">egrep</span>           
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">egrep</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">sed</span>             
+                                                <span class="special">=</span> <span class="identifier">basic</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">sed</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">perl</span>            
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">literal</span>         
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">literal</span><span class="special">;</span>
+
+   <span class="comment">// modifiers specific to perl expressions:
+</span>   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_mod_m</span>        
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_mod_m</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_mod_s</span>        
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_mod_s</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">mod_s</span>           
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">mod_s</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">mod_x</span>           
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">mod_x</span><span class="special">;</span>
+
+   <span class="comment">// modifiers specific to POSIX basic expressions:
+</span>   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">bk_plus_qm</span>      
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">bk_plus_qm</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">bk_vbar</span>         
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">bk_vbar</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_char_classes</span> 
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_char_classes</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_intervals</span>    
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_intervals</span>
+
+   <span class="comment">// common modifiers:
+</span>   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">nosubs</span>          
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">nosubs</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">optimize</span>        
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">optimize</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">collate</span>         
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">collate</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">newline_alt</span>     
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">newline_alt</span><span class="special">;</span>
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_except</span>       
+                                                <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">newline_alt</span><span class="special">;</span>
+
+   <span class="comment">// construct/copy/destroy:
+</span>   <span class="keyword">explicit</span> <a href="basic_regex.html#boost_regex.basic_regex.construct1">basic_regex</a> <span class="special">();</span>
+   <span class="keyword">explicit</span> <a href="basic_regex.html#boost_regex.basic_regex.construct2">basic_regex</a><span class="special">(</span><span class="keyword">const</span>  <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.construct3">basic_regex</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p1</span><span class="special">,</span> <span class="keyword">const</span>  <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p2</span><span class="special">,</span> 
+               <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.construct4">basic_regex</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">size_type</span> <span class="identifier">len</span><span class="special">,</span> <span class="identifier">flag_type</span>  <span class="identifier">f</span><span class="special">);</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.construct5">basic_regex</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&amp;);</span>
+
+   <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span>
+   <span class="keyword">explicit</span> <a href="basic_regex.html#boost_regex.basic_regex.construct6">basic_regex</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span>  <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+                        <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+
+   <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">InputIterator</span><span class="special">&gt;</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.construct7">basic_regex</a><span class="special">(</span><span class="identifier">InputIterator</span> <span class="identifier">first</span><span class="special">,</span>  <span class="identifier">InputIterator</span> <span class="identifier">last</span><span class="special">,</span> 
+               <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+
+   <span class="special">~</span><span class="identifier">basic_regex</span><span class="special">();</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.opeq1">basic_regex&amp; operator=</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&amp;);</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.opeq2">basic_regex&amp; operator=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">ptr</span><span class="special">);</span> 
+
+   <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span> 
+   <a href="basic_regex.html#boost_regex.basic_regex.opeq3">basic_regex&amp; operator=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">);</span>
+   <span class="comment">// iterators: 
+</span>   <a href="basic_regex.html#boost_regex.basic_regex.begin">const_iterator begin</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span> 
+   <a href="basic_regex.html#boost_regex.basic_regex.end">const_iterator end</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="comment">// capacity: 
+</span>   <a href="basic_regex.html#boost_regex.basic_regex.size">size_type size</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span> 
+   <a href="basic_regex.html#boost_regex.basic_regex.max_size">size_type max_size</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span> 
+   <a href="basic_regex.html#boost_regex.basic_regex.empty">bool empty</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span> 
+   <a href="basic_regex.html#boost_regex.basic_regex.mark_count">unsigned mark_count</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span> 
+   <span class="comment">//
+</span>   <span class="comment">// modifiers: 
+</span>   <a href="basic_regex.html#boost_regex.basic_regex.assign1">basic_regex&amp; assign</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">);</span> 
+   <a href="basic_regex.html#boost_regex.basic_regex.assign2">basic_regex&amp; assign</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">ptr</span><span class="special">,</span> 
+                       <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.assign3">basic_regex&amp; assign</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">ptr</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">len</span><span class="special">,</span> <span class="identifier">flag_type</span> <span class="identifier">f</span><span class="special">);</span>
+
+   <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">string_traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">A</span><span class="special">&gt;</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.assign4">basic_regex&amp; assign</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">string_traits</span><span class="special">,</span> <span class="identifier">A</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                       <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+
+   <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">InputIterator</span><span class="special">&gt;</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.assign5">basic_regex&amp; assign</a><span class="special">(</span><span class="identifier">InputIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">InputIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                       <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+
+   <span class="comment">// const operations:
+</span>   <a href="basic_regex.html#boost_regex.basic_regex.flags">flag_type flags</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.status">int status</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.str">basic_string&lt;charT&gt; str</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.compare">int compare</a><span class="special">(</span><span class="identifier">basic_regex</span><span class="special">&amp;)</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="comment">// locale:
+</span>   <a href="basic_regex.html#boost_regex.basic_regex.imbue">locale_type imbue</a><span class="special">(</span><span class="identifier">locale_type</span> <span class="identifier">loc</span><span class="special">);</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.getloc">locale_type getloc</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="comment">// swap
+</span>   <a href="basic_regex.html#boost_regex.basic_regex.swap">void swap</a><span class="special">(</span><span class="identifier">basic_regex</span><span class="special">&amp;)</span> <span class="keyword">throw</span><span class="special">();</span>
+<span class="special">};</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<a href="basic_regex.html#boost_regex.basic_regex.op_eq">bool operator ==</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<a href="basic_regex.html#boost_regex.basic_regex.op_ne">bool operator !=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<a href="basic_regex.html#boost_regex.basic_regex.op_lt">bool operator &lt;</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<a href="basic_regex.html#boost_regex.basic_regex.op_le">bool operator &lt;=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<a href="basic_regex.html#boost_regex.basic_regex.op_ge">bool operator &gt;=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<a href="basic_regex.html#boost_regex.basic_regex.op_gt">bool operator &gt;</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">io_traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">re_traits</span><span class="special">&gt;</span>
+<span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">io_traits</span><span class="special">&gt;&amp;</span>
+   <a href="basic_regex.html#boost_regex.basic_regex.op_stream">operator &lt;&lt;</a> <span class="special">(</span><span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">io_traits</span><span class="special">&gt;&amp;</span> <span class="identifier">os</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">re_traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<a href="basic_regex.html#boost_regex.basic_regex.op_swap">void swap</a><span class="special">(</span><span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e1</span><span class="special">,</span>
+         <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e2</span><span class="special">);</span>
+
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">regex</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="keyword">wchar_t</span><span class="special">&gt;</span> <span class="identifier">wregex</span><span class="special">;</span>
+
+<span class="special">}</span> <span class="comment">// namespace boost
+</span></pre>
+<a name="boost_regex.ref.basic_regex.description"></a><h4>
+<a name="id488473"></a>
+        <a href="basic_regex.html#boost_regex.ref.basic_regex.description">Description</a>
+      </h4>
+<p>
+        Class <tt class="computeroutput"><span class="identifier">basic_regex</span></tt> has the
+        following public members:
+      </p>
+<pre class="programlisting">
+<span class="comment">// main option selection:
+</span><span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">normal</span>           
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">ECMAScript</span>       
+                                          <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">JavaScript</span>       
+                                          <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">JScript</span>          
+                                          <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">basic</span>            
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">basic</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">extended</span>         
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">extended</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">awk</span>              
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">awk</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">grep</span>             
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">grep</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">egrep</span>            
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">egrep</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">sed</span>              
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">sed</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">perl</span>             
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">literal</span>          
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">literal</span><span class="special">;</span>
+
+<span class="comment">// modifiers specific to perl expressions:
+</span><span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_mod_m</span>         
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_mod_m</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_mod_s</span>         
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_mod_s</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">mod_s</span>            
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">mod_s</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">mod_x</span>            
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">mod_x</span><span class="special">;</span>
+
+<span class="comment">// modifiers specific to POSIX basic expressions:
+</span><span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">bk_plus_qm</span>       
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">bk_plus_qm</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">bk_vbar</span>          
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">bk_vbar</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_char_classes</span>  
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_char_classes</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">no_intervals</span>     
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">no_intervals</span>
+
+<span class="comment">// common modifiers:
+</span><span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">nosubs</span>           
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">nosubs</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">optimize</span>         
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">optimize</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">collate</span>          
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">collate</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">regex_constants</span><span class="special">::</span> <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> <span class="identifier">newline_alt</span>      
+                                          <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">newline_alt</span><span class="special">;</span>
+</pre>
+<p>
+        The meaning of these options is documented in the <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> section.
+      </p>
+<p>
+        The static constant members are provided as synonyms for the constants declared
+        in namespace <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span></tt>; for each constant of type
+        <a href="syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a>
+        declared in namespace <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span></tt>
+        then a constant with the same name, type and value is declared within the
+        scope of basic_regex.
+      </p>
+<a name="boost_regex.basic_regex.construct1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">();</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <tt class="computeroutput"><span class="identifier">basic_regex</span></tt>.
+      </p>
+<div class="table">
+<a name="id490413"></a><p class="title"><b>Table 1. basic_regex default construction postconditions</b></p>
+<table class="table" summary="basic_regex default construction postconditions">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Element
+            </p>
+            </th>
+<th>
+            <p>
+              Value
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="keyword">true</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="number">0</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">str</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;()</span></tt>
+            </p>
+            </td>
+</tr>
+</tbody>
+</table>
+</div>
+<a name="boost_regex.basic_regex.construct2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: <span class="emphasis"><em>p</em></span> shall not
+        be a null pointer.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <a href="bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> if <span class="emphasis"><em>p</em></span>
+        is not a valid regular expression, unless the flag <tt class="computeroutput"><span class="identifier">no_except</span></tt>
+        is set in <span class="emphasis"><em>f</em></span>.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>;
+        the object's internal finite state machine is constructed from the regular
+        expression contained in the null-terminated string <span class="emphasis"><em>p</em></span>,
+        and interpreted according to the <a href="syntax_option_type.html" title=" syntax_option_type">option
+        flags</a> specified in <span class="emphasis"><em>f</em></span>.
+      </p>
+<div class="table">
+<a name="id490814"></a><p class="title"><b>Table 2. Postconditions for basic_regex construction</b></p>
+<table class="table" summary="Postconditions for basic_regex construction">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Element
+            </p>
+            </th>
+<th>
+            <p>
+              Value
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="keyword">false</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">char_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;::</span><span class="identifier">length</span><span class="special">(</span><span class="identifier">p</span><span class="special">)</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">str</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">)</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>f</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">mark_count</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              The number of marked sub-expressions within the expression.
+            </p>
+            </td>
+</tr>
+</tbody>
+</table>
+</div>
+<a name="boost_regex.basic_regex.construct3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p1</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p2</span><span class="special">,</span> 
+            <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: <span class="emphasis"><em>p1</em></span> and <span class="emphasis"><em>p2</em></span>
+        are not null pointers, <tt class="computeroutput"><span class="identifier">p1</span> <span class="special">&lt;</span> <span class="identifier">p2</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: bad_expression if [p1,p2) is not
+        a valid regular expression, unless the flag <tt class="computeroutput"><span class="identifier">no_except</span></tt>
+        is set in <span class="emphasis"><em>f</em></span>.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>;
+        the object's internal finite state machine is constructed from the regular
+        expression contained in the sequence of characters [p1,p2), and interpreted
+        according the <a href="syntax_option_type.html" title=" syntax_option_type">option flags</a>
+        specified in <span class="emphasis"><em>f</em></span>.
+      </p>
+<div class="table">
+<a name="id491362"></a><p class="title"><b>Table 3. Postconditions for basic_regex construction</b></p>
+<table class="table" summary="Postconditions for basic_regex construction">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Element
+            </p>
+            </th>
+<th>
+            <p>
+              Value
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="keyword">false</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">distance</span><span class="special">(</span><span class="identifier">p1</span><span class="special">,</span><span class="identifier">p2</span><span class="special">)</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">str</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;(</span><span class="identifier">p1</span><span class="special">,</span><span class="identifier">p2</span><span class="special">)</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>f</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">mark_count</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              The number of marked sub-expressions within the expression.
+            </p>
+            </td>
+</tr>
+</tbody>
+</table>
+</div>
+<a name="boost_regex.basic_regex.construct4"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">size_type</span> <span class="identifier">len</span><span class="special">,</span> <span class="identifier">flag_type</span> <span class="identifier">f</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: <span class="emphasis"><em>p</em></span> shall not
+        be a null pointer, <tt class="computeroutput"><span class="identifier">len</span> <span class="special">&lt;</span>
+        <span class="identifier">max_size</span><span class="special">()</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <a href="bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> if <span class="emphasis"><em>p</em></span>
+        is not a valid regular expression, unless the flag <tt class="computeroutput"><span class="identifier">no_except</span></tt>
+        is set in <span class="emphasis"><em>f</em></span>.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>;
+        the object's internal finite state machine is constructed from the regular
+        expression contained in the sequence of characters [p, p+len), and interpreted
+        according the option flags specified in <span class="emphasis"><em>f</em></span>.
+      </p>
+<div class="table">
+<a name="id491897"></a><p class="title"><b>Table 4. Postconditions for basic_regex construction</b></p>
+<table class="table" summary="Postconditions for basic_regex construction">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Element
+            </p>
+            </th>
+<th>
+            <p>
+              Value
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="keyword">false</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>len</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">str</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">,</span> <span class="identifier">len</span><span class="special">)</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>f</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">mark_count</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              The number of marked sub-expressions within the expression.
+            </p>
+            </td>
+</tr>
+</tbody>
+</table>
+</div>
+<a name="boost_regex.basic_regex.construct5"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>
+        as a copy of the object <span class="emphasis"><em>e</em></span>.
+      </p>
+<a name="boost_regex.basic_regex.construct6"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span>
+<span class="identifier">basic_regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+            <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Throws</b></span>: <a href="bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> if <span class="emphasis"><em>s</em></span>
+        is not a valid regular expression, unless the flag <tt class="computeroutput"><span class="identifier">no_except</span></tt>
+        is set in <span class="emphasis"><em>f</em></span>.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>;
+        the object's internal finite state machine is constructed from the regular
+        expression contained in the string <span class="emphasis"><em>s</em></span>, and interpreted
+        according to the <a href="syntax_option_type.html" title=" syntax_option_type">option
+        flags</a> specified in <span class="emphasis"><em>f</em></span>.
+      </p>
+<div class="table">
+<a name="id492536"></a><p class="title"><b>Table 5. Postconditions for basic_regex construction</b></p>
+<table class="table" summary="Postconditions for basic_regex construction">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Element
+            </p>
+            </th>
+<th>
+            <p>
+              Value
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="keyword">false</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">s</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">str</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>s</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>f</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">mark_count</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              The number of marked sub-expressions within the expression.
+            </p>
+            </td>
+</tr>
+</tbody>
+</table>
+</div>
+<a name="boost_regex.basic_regex.construct7"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ForwardIterator</span><span class="special">&gt;</span>
+<span class="identifier">basic_regex</span><span class="special">(</span><span class="identifier">ForwardIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">ForwardIterator</span> <span class="identifier">last</span><span class="special">,</span> 
+            <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Throws</b></span>: <a href="bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> if the sequence [first,
+        last) is not a valid regular expression, unless the flag <tt class="computeroutput"><span class="identifier">no_except</span></tt>
+        is set in <span class="emphasis"><em>f</em></span>.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>;
+        the object's internal finite state machine is constructed from the regular
+        expression contained in the sequence of characters [first, last), and interpreted
+        according to the <a href="syntax_option_type.html" title=" syntax_option_type">option
+        flags</a> specified in <span class="emphasis"><em>f</em></span>.
+      </p>
+<div class="table">
+<a name="id493013"></a><p class="title"><b>Table 6. Postconditions for basic_regex construction</b></p>
+<table class="table" summary="Postconditions for basic_regex construction">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Element
+            </p>
+            </th>
+<th>
+            <p>
+              Value
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="keyword">false</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">distance</span><span class="special">(</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">last</span><span class="special">)</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">str</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;(</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">last</span><span class="special">)</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>f</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">mark_count</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              The number of marked sub-expressions within the expression.
+            </p>
+            </td>
+</tr>
+</tbody>
+</table>
+</div>
+<a name="boost_regex.basic_regex.opeq1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">assign</span><span class="special">(</span><span class="identifier">e</span><span class="special">.</span><span class="identifier">str</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">.</span><span class="identifier">flags</span><span class="special">())</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.opeq2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">ptr</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: <span class="emphasis"><em>p</em></span> shall not
+        be a null pointer.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">assign</span><span class="special">(</span><span class="identifier">ptr</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.opeq3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span>
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">assign</span><span class="special">(</span><span class="identifier">p</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.begin"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">const_iterator</span> <span class="identifier">begin</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a starting iterator to
+        a sequence of characters representing the regular expression.
+      </p>
+<a name="boost_regex.basic_regex.end"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">const_iterator</span> <span class="identifier">end</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns termination iterator to
+        a sequence of characters representing the regular expression.
+      </p>
+<a name="boost_regex.basic_regex.size"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">size_type</span> <span class="identifier">size</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the length of the sequence
+        of characters representing the regular expression.
+      </p>
+<a name="boost_regex.basic_regex.max_size"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">size_type</span> <span class="identifier">max_size</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the maximum length of the
+        sequence of characters representing the regular expression.
+      </p>
+<a name="boost_regex.basic_regex.empty"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="identifier">empty</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns true if the object does
+        not contain a valid regular expression, otherwise false.
+      </p>
+<a name="boost_regex.basic_regex.mark_count"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">unsigned</span> <span class="identifier">mark_count</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the number of marked sub-expressions
+        within the regular expresion.
+      </p>
+<a name="boost_regex.basic_regex.assign1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">assign</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <a href="basic_regex.html#boost_regex.basic_regex.assign4"><tt class="computeroutput"><span class="identifier">assign</span><span class="special">(</span><span class="identifier">that</span><span class="special">.</span><span class="identifier">str</span><span class="special">(),</span> <span class="identifier">that</span><span class="special">.</span><span class="identifier">flags</span><span class="special">())</span></tt></a>.
+      </p>
+<a name="boost_regex.basic_regex.assign2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">assign</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">ptr</span><span class="special">,</span> <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <a href="basic_regex.html#boost_regex.basic_regex.assign4"><tt class="computeroutput"><span class="identifier">assign</span><span class="special">(</span><span class="identifier">string_type</span><span class="special">(</span><span class="identifier">ptr</span><span class="special">),</span> <span class="identifier">f</span><span class="special">)</span></tt></a>.
+      </p>
+<a name="boost_regex.basic_regex.assign3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">assign</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">ptr</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">len</span><span class="special">,</span> <span class="identifier">flag_type</span> <span class="identifier">f</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <a href="basic_regex.html#boost_regex.basic_regex.assign4"><tt class="computeroutput"><span class="identifier">assign</span><span class="special">(</span><span class="identifier">string_type</span><span class="special">(</span><span class="identifier">ptr</span><span class="special">,</span> <span class="identifier">len</span><span class="special">),</span> <span class="identifier">f</span><span class="special">)</span></tt></a>.
+      </p>
+<a name="boost_regex.basic_regex.assign4"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">string_traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">A</span><span class="special">&gt;</span>
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">assign</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">string_traits</span><span class="special">,</span> <span class="identifier">A</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                  <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Throws</b></span>: <a href="bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> if <span class="emphasis"><em>s</em></span>
+        is not a valid regular expression, unless the flag <tt class="computeroutput"><span class="identifier">no_except</span></tt>
+        is set in <span class="emphasis"><em>f</em></span>.
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: *this.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Assigns the regular expression
+        contained in the string <span class="emphasis"><em>s</em></span>, interpreted according the
+        <a href="syntax_option_type.html" title=" syntax_option_type">option flags</a> specified
+        in <span class="emphasis"><em>f</em></span>.
+      </p>
+<div class="table">
+<a name="id494890"></a><p class="title"><b>Table 7. Postconditions for basic_regex::assign</b></p>
+<table class="table" summary="Postconditions for basic_regex::assign">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+            <p>
+              Element
+            </p>
+            </th>
+<th>
+            <p>
+              Value
+            </p>
+            </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="keyword">false</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">s</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">str</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>s</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              <span class="emphasis"><em>f</em></span>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <tt class="computeroutput"><span class="identifier">mark_count</span><span class="special">()</span></tt>
+            </p>
+            </td>
+<td>
+            <p>
+              The number of marked sub-expressions within the expression.
+            </p>
+            </td>
+</tr>
+</tbody>
+</table>
+</div>
+<a name="boost_regex.basic_regex.assign5"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">InputIterator</span><span class="special">&gt;</span>
+<span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">assign</span><span class="special">(</span><span class="identifier">InputIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">InputIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                    <span class="identifier">flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: The type <tt class="computeroutput"><span class="identifier">InputIterator</span></tt>
+        corresponds to the <a href="http://input_iterator" target="_top">Input Iterator requirements
+        (24.1.1)</a>.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <a href="basic_regex.html#boost_regex.basic_regex.assign4"><tt class="computeroutput"><span class="identifier">assign</span><span class="special">(</span><span class="identifier">string_type</span><span class="special">(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">),</span> <span class="identifier">f</span><span class="special">)</span></tt></a>.
+      </p>
+<a name="boost_regex.basic_regex.flags"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">flag_type</span> <span class="identifier">flags</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a copy of the <a href="syntax_option_type.html" title=" syntax_option_type">regular
+        expression syntax flags</a> that were passed to the object's constructor,
+        or the last call to <tt class="computeroutput"><span class="identifier">assign</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.status"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">int</span> <span class="identifier">status</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns zero if the expression
+        contains a valid regular expression, otherwise an error code. This member
+        function is retained for use in environments that cannot use exception handling.
+      </p>
+<a name="boost_regex.basic_regex.str"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="identifier">str</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a copy of the character
+        sequence passed to the object's constructor, or the last call to assign.
+      </p>
+<a name="boost_regex.basic_regex.compare"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">int</span> <span class="identifier">compare</span><span class="special">(</span><span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: If <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span> <span class="special">==</span> <span class="identifier">e</span><span class="special">.</span><span class="identifier">flags</span><span class="special">()</span></tt> then returns <tt class="computeroutput"><span class="identifier">str</span><span class="special">().</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">e</span><span class="special">.</span><span class="identifier">str</span><span class="special">())</span></tt>,
+        otherwise returns <tt class="computeroutput"><span class="identifier">flags</span><span class="special">()</span>
+        <span class="special">-</span> <span class="identifier">e</span><span class="special">.</span><span class="identifier">flags</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.imbue"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">locale_type</span> <span class="identifier">imbue</span><span class="special">(</span><span class="identifier">locale_type</span> <span class="identifier">l</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">traits_inst</span><span class="special">.</span><span class="identifier">imbue</span><span class="special">(</span><span class="identifier">l</span><span class="special">)</span></tt> where
+        <tt class="computeroutput"><span class="identifier">traits_inst</span></tt> is a (default
+        initialized) instance of the template parameter <tt class="computeroutput"><span class="identifier">traits</span></tt>
+        stored within the object. Calls to <tt class="computeroutput"><span class="identifier">imbue</span></tt>
+        invalidate any currently contained regular expression.
+      </p>
+<p>
+        <span class="bold"><b>Postcondition</b></span>: <tt class="computeroutput"><span class="identifier">empty</span><span class="special">()</span> <span class="special">==</span> <span class="keyword">true</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.getloc"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">locale_type</span> <span class="identifier">getloc</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">traits_inst</span><span class="special">.</span><span class="identifier">getloc</span><span class="special">()</span></tt>
+        where <tt class="computeroutput"><span class="identifier">traits_inst</span></tt> is a (default
+        initialized) instance of the template parameter traits stored within the
+        object.
+      </p>
+<a name="boost_regex.basic_regex.swap"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">void</span> <span class="identifier">swap</span><span class="special">(</span><span class="identifier">basic_regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">)</span> <span class="keyword">throw</span><span class="special">();</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Swaps the contents of the two regular
+        expressions.
+      </p>
+<p>
+        <span class="bold"><b>Postcondition</b></span>: <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> contains the regular expression that
+        was in <span class="emphasis"><em>e</em></span>, <span class="emphasis"><em>e</em></span> contains the regular
+        expression that was in <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Complexity</b></span>: constant time.
+      </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          Comparisons between <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> objects are provided
+          on an experimental basis: please note that these are not present in the
+          <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf" target="_top">Technical
+          Report on C++ Library Extensions</a>, so use with care if you are writing
+          code that may need to be ported to other implementations of <a href="basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>.
+        </p></td></tr>
+</table></div>
+<a name="boost_regex.basic_regex.op_eq"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">==</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.op_ne"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">!=</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.op_lt"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&lt;</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.op_le"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&lt;=</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.op_ge"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&gt;=</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.op_gt"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&gt;</span> <span class="number">0</span></tt>.
+      </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          The basic_regex stream inserter is provided on an experimental basis, and
+          outputs the textual representation of the expression to the stream.
+        </p></td></tr>
+</table></div>
+<a name="boost_regex.basic_regex.op_stream"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">io_traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">re_traits</span><span class="special">&gt;</span>
+<span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">io_traits</span><span class="special">&gt;&amp;</span>
+   <span class="keyword">operator</span> <span class="special">&lt;&lt;</span> <span class="special">(</span><span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">io_traits</span><span class="special">&gt;&amp;</span> <span class="identifier">os</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">re_traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns <tt class="computeroutput"><span class="special">(</span><span class="identifier">os</span> <span class="special">&lt;&lt;</span> <span class="identifier">e</span><span class="special">.</span><span class="identifier">str</span><span class="special">())</span></tt>.
+      </p>
+<a name="boost_regex.basic_regex.op_swap"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">void</span> <span class="identifier">swap</span><span class="special">(</span><span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+         <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: calls <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">swap</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span></tt>.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../ref.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="match_results.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/concepts.html b/doc/html/boost_regex/ref/concepts.html
new file mode 100644
index 00000000..92dd469b
--- /dev/null
+++ b/doc/html/boost_regex/ref/concepts.html
@@ -0,0 +1,48 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Concepts</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="posix.html" title=" POSIX Compatible C API's">
+<link rel="next" href="concepts/charT_concept.html" title=" charT Requirements">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="posix.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts/charT_concept.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.concepts"></a><a href="concepts.html" title=" Concepts"> Concepts</a></h3></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="concepts/charT_concept.html"> charT Requirements</a></span></dt>
+<dt><span class="section"><a href="concepts/traits_concept.html"> Traits Class
+        Requirements</a></span></dt>
+<dt><span class="section"><a href="concepts/iterator_concepts.html"> Iterator
+        Rrequirements</a></span></dt>
+</dl></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="posix.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts/charT_concept.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/concepts/charT_concept.html b/doc/html/boost_regex/ref/concepts/charT_concept.html
new file mode 100644
index 00000000..b4a51491
--- /dev/null
+++ b/doc/html/boost_regex/ref/concepts/charT_concept.html
@@ -0,0 +1,271 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> charT Requirements</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../concepts.html" title=" Concepts">
+<link rel="prev" href="../concepts.html" title=" Concepts">
+<link rel="next" href="traits_concept.html" title=" Traits Class
+        Requirements">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../concepts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="traits_concept.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.concepts.charT_concept"></a><a href="charT_concept.html" title=" charT Requirements"> charT Requirements</a></h4></div></div></div>
+<p>
+          Type <tt class="computeroutput"><span class="identifier">charT</span></tt> used a template
+          argument to class template <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>, must have a trivial
+          default constructor, copy constructor, assignment operator, and destructor.
+          In addition the following requirements must be met for objects; <span class="emphasis"><em>c</em></span>
+          of type <tt class="computeroutput"><span class="identifier">charT</span></tt>, <span class="emphasis"><em>c1</em></span>
+          and <span class="emphasis"><em>c2</em></span> of type <tt class="computeroutput"><span class="identifier">charT</span>
+          <span class="keyword">const</span></tt>, and <span class="emphasis"><em>i</em></span>
+          of type <tt class="computeroutput"><span class="keyword">int</span></tt>:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Expression
+                </p>
+                </th>
+<th>
+                <p>
+                  Return type
+                </p>
+                </th>
+<th>
+                <p>
+                  Assertion / Note / Pre- / Post-condition
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  charT c
+                </p>
+                </td>
+<td>
+                <p>
+                  charT
+                </p>
+                </td>
+<td>
+                <p>
+                  Default constructor (must be trivial).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  charT c(c1)
+                </p>
+                </td>
+<td>
+                <p>
+                  charT
+                </p>
+                </td>
+<td>
+                <p>
+                  Copy constructor (must be trivial).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  c1 = c2
+                </p>
+                </td>
+<td>
+                <p>
+                  charT
+                </p>
+                </td>
+<td>
+                <p>
+                  Assignment operator (must be trivial).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  c1 == c2
+                </p>
+                </td>
+<td>
+                <p>
+                  bool
+                </p>
+                </td>
+<td>
+                <p>
+                  true if c1 has the same value as c2.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  c1 != c2
+                </p>
+                </td>
+<td>
+                <p>
+                  bool
+                </p>
+                </td>
+<td>
+                <p>
+                  true if c1 and c2 are not equal.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  c1 &lt; c2
+                </p>
+                </td>
+<td>
+                <p>
+                  bool
+                </p>
+                </td>
+<td>
+                <p>
+                  true if the value of c1 is less than c2.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  c1 &gt; c2
+                </p>
+                </td>
+<td>
+                <p>
+                  bool
+                </p>
+                </td>
+<td>
+                <p>
+                  true if the value of c1 is greater than c2.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  c1 &lt;= c2
+                </p>
+                </td>
+<td>
+                <p>
+                  bool
+                </p>
+                </td>
+<td>
+                <p>
+                  true if c1 is less than or equal to c2.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  c1 &gt;= c2
+                </p>
+                </td>
+<td>
+                <p>
+                  bool
+                </p>
+                </td>
+<td>
+                <p>
+                  true if c1 is greater than or equal to c2.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  intmax_t i = c1
+                </p>
+                </td>
+<td>
+                <p>
+                  int
+                </p>
+                </td>
+<td>
+                <p>
+                  charT must be convertible to an integral type.
+                </p>
+                <p>
+                  Note: type charT is not required to support this operation, if
+                  the traits class used supports the full Boost-specific interface,
+                  rather than the minimal standardised-interface (see traits class
+                  requirements below).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  charT c(i);
+                </p>
+                </td>
+<td>
+                <p>
+                  charT
+                </p>
+                </td>
+<td>
+                <p>
+                  charT must be constructable from an integral type.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../concepts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="traits_concept.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/concepts/iterator_concepts.html b/doc/html/boost_regex/ref/concepts/iterator_concepts.html
new file mode 100644
index 00000000..8e117a29
--- /dev/null
+++ b/doc/html/boost_regex/ref/concepts/iterator_concepts.html
@@ -0,0 +1,48 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Iterator
+        Rrequirements</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../concepts.html" title=" Concepts">
+<link rel="prev" href="traits_concept.html" title=" Traits Class
+        Requirements">
+<link rel="next" href="../deprecated_interfaces.html" title="Deprecated Interfaces">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="traits_concept.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.concepts.iterator_concepts"></a><a href="iterator_concepts.html" title=" Iterator
+        Rrequirements"> Iterator
+        Rrequirements</a></h4></div></div></div>
+<p>
+          The regular expression algorithms (and iterators) take all require a Bidirectional-Iterator.
+        </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="traits_concept.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/concepts/traits_concept.html b/doc/html/boost_regex/ref/concepts/traits_concept.html
new file mode 100644
index 00000000..5a634cad
--- /dev/null
+++ b/doc/html/boost_regex/ref/concepts/traits_concept.html
@@ -0,0 +1,614 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Traits Class
+        Requirements</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../concepts.html" title=" Concepts">
+<link rel="prev" href="charT_concept.html" title=" charT Requirements">
+<link rel="next" href="iterator_concepts.html" title=" Iterator
+        Rrequirements">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="charT_concept.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="iterator_concepts.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.concepts.traits_concept"></a><a href="traits_concept.html" title=" Traits Class
+        Requirements"> Traits Class
+        Requirements</a></h4></div></div></div>
+<p>
+          There are two sets of requirements for the <tt class="computeroutput"><span class="identifier">traits</span></tt>
+          template argument to <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>: a mininal interface
+          (which is part of the regex standardization proposal), and an optional
+          Boost-specific enhanced interface.
+        </p>
+<a name="boost_regex.ref.concepts.traits_concept.minimal_requirements_"></a><h4>
+<a name="id589905"></a>
+          <a href="traits_concept.html#boost_regex.ref.concepts.traits_concept.minimal_requirements_">Minimal
+          requirements.</a>
+        </h4>
+<p>
+          In the following table <tt class="computeroutput"><span class="identifier">X</span></tt>
+          denotes a traits class defining types and functions for the character container
+          type <tt class="computeroutput"><span class="identifier">charT</span></tt>; <span class="emphasis"><em>u</em></span>
+          is an object of type <tt class="computeroutput"><span class="identifier">X</span></tt>;
+          <span class="emphasis"><em>v</em></span> is an object of type <tt class="computeroutput"><span class="keyword">const</span>
+          <span class="identifier">X</span></tt>; <span class="emphasis"><em>p</em></span> is
+          a value of type <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span></tt>; <span class="emphasis"><em>I1</em></span> and <span class="emphasis"><em>I2</em></span>
+          are Input Iterators; <span class="emphasis"><em>c</em></span> is a value of type <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">charT</span></tt>;
+          <span class="emphasis"><em>s</em></span> is an object of type <tt class="computeroutput"><span class="identifier">X</span><span class="special">::</span><span class="identifier">string_type</span></tt>;
+          <span class="emphasis"><em>cs</em></span> is an object of type <tt class="computeroutput"><span class="keyword">const</span>
+          <span class="identifier">X</span><span class="special">::</span><span class="identifier">string_type</span></tt>; <span class="emphasis"><em>b</em></span> is
+          a value of type <tt class="computeroutput"><span class="keyword">bool</span></tt>; <span class="emphasis"><em>I</em></span>
+          is a value of type <tt class="computeroutput"><span class="keyword">int</span></tt>; <span class="emphasis"><em>F1</em></span>
+          and <span class="emphasis"><em>F2</em></span> are values of type <tt class="computeroutput"><span class="keyword">const</span>
+          <span class="identifier">charT</span><span class="special">*</span></tt>;
+          and <span class="emphasis"><em>loc</em></span> is an object of type <tt class="computeroutput"><span class="identifier">X</span><span class="special">::</span><span class="identifier">locale_type</span></tt>.
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Expression
+                </p>
+                </th>
+<th>
+                <p>
+                  Return type
+                </p>
+                </th>
+<th>
+                <p>
+                  Assertion / Note Pre / Post condition
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  X::char_type
+                </p>
+                </td>
+<td>
+                <p>
+                  charT
+                </p>
+                </td>
+<td>
+                <p>
+                  The character container type used in the implementation of class
+                  template basic_regex.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  X::size_type
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
+                  An unsigned integer type, capable of holding the length of a null-terminated
+                  string of charT's.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  X::string_type
+                </p>
+                </td>
+<td>
+                <p>
+                  std::basic_string&lt;charT&gt; or std::vector&lt;charT&gt;
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  X::locale_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Implementation defined
+                </p>
+                </td>
+<td>
+                <p>
+                  A copy constructible type that represents the locale used by the
+                  traits class.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  X::char_class_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Implementation defined
+                </p>
+                </td>
+<td>
+                <p>
+                  A bitmask type representing a particular character classification.
+                  Multiple values of this type can be bitwise-or'ed together to obtain
+                  a new valid value.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  X::length(p)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::size_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Yields the smallest i such that p[i] == 0. Complexity is linear
+                  in i.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.translate(c)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::char_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a character such that for any character d that is to be
+                  considered equivalent to c then v.translate(c) == v.translate(d).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.translate_nocase(c)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::char_type
+                </p>
+                </td>
+<td>
+                <p>
+                  For all characters C that are to be considered equivalent to c
+                  when comparisons are to be performed without regard to case, then
+                  v.translate_nocase(c) == v.translate_nocase(C).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.transform(F1, F2)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::string_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a sort key for the character sequence designated by the
+                  iterator range [F1, F2) such that if the character sequence [G1,
+                  G2) sorts before the character sequence [H1, H2) then v.transform(G1,
+                  G2) &lt; v.transform(H1, H2).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.transform_primary(F1, F2)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::string_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a sort key for the character sequence designated by the
+                  iterator range [F1, F2) such that if the character sequence [G1,
+                  G2) sorts before the character sequence [H1, H2) when character
+                  case is not considered then v.transform_primary(G1, G2) &lt; v.transform_primary(H1,
+                  H2).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.lookup_classname(F1, F2)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::char_class_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Converts the character sequence designated by the iterator range
+                  [F1,F2) into a bitmask type that can subsequently be passed to
+                  isctype. Values returned from lookup_classname can be safely bitwise
+                  or'ed together. Returns 0 if the character sequence is not the
+                  name of a character class recognized by X. The value returned shall
+                  be independent of the case of the characters in the sequence.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.lookup_collatename(F1, F2)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::string_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a sequence of characters that represents the collating
+                  element consisting of the character sequence designated by the
+                  iterator range [F1, F2). Returns an empty string if the character
+                  sequence is not a valid collating element.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.isctype(c, v.lookup_classname (F1, F2))
+                </p>
+                </td>
+<td>
+                <p>
+                  bool
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns true if character c is a member of the character class
+                  designated by the iterator range [F1, F2), false otherwise.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.value(c, i)
+                </p>
+                </td>
+<td>
+                <p>
+                  int
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns the value represented by the digit c in base I if the character
+                  c is a valid digit in base I; otherwise returns -1. [Note: the
+                  value of I will only be 8, 10, or 16. -end note]
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  u.imbue(loc)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::locale_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Imbues u with the locale loc, returns the previous locale used
+                  by u if any.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.getloc()
+                </p>
+                </td>
+<td>
+                <p>
+                  X::locale_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns the current locale used by v if any.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.error_string(i)
+                </p>
+                </td>
+<td>
+                <p>
+                  std::string
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a human readable error string for the error condition i,
+                  where i is one of the values enumerated by type regex_constants::error_type.
+                  If the value i is not recognized then returns the string "Unknown
+                  error" or a localized equivalent.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.ref.concepts.traits_concept.additional_optional_requirements"></a><h4>
+<a name="id590748"></a>
+          <a href="traits_concept.html#boost_regex.ref.concepts.traits_concept.additional_optional_requirements">Additional
+          Optional Requirements</a>
+        </h4>
+<p>
+          The following additional requirements are strictly optional, however in
+          order for <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>
+          to take advantage of these additional interfaces, all of the following
+          requirements must be met; <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> will detect the presence
+          or absense of the member <tt class="computeroutput"><span class="identifier">boost_extensions_tag</span></tt>
+          and configure itself appropriately.
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Expression
+                </p>
+                </th>
+<th>
+                <p>
+                  Result
+                </p>
+                </th>
+<th>
+                <p>
+                  Assertion / Note Pre / Post condition
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  X::boost_extensions_tag
+                </p>
+                </td>
+<td>
+                <p>
+                  An unspecified type.
+                </p>
+                </td>
+<td>
+                <p>
+                  When present, all of the extensions listed in this table must be
+                  present.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.syntax_type(c)
+                </p>
+                </td>
+<td>
+                <p>
+                  regex_constants::syntax_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a symbolic value of type regex_constants::syntax_type that
+                  signifies the meaning of character c within the regular expression
+                  grammar.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.escape_syntax_type(c)
+                </p>
+                </td>
+<td>
+                <p>
+                  regex_constants::escape_syntax_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a symbolic value of type regex_constants::escape_syntax_type,
+                  that signifies the meaning of character c within the regular expression
+                  grammar, when c has been preceded by an escape character. Precondition:
+                  if b is the character preceding c in the expression being parsed
+                  then: <tt class="computeroutput"><span class="identifier">v</span><span class="special">.</span><span class="identifier">syntax_type</span><span class="special">(</span><span class="identifier">b</span><span class="special">)</span>
+                  <span class="special">==</span> <span class="identifier">syntax_escape</span></tt>
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.translate(c, b)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::char_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a character d such that: for any character d that is to
+                  be considered equivalent to c then <tt class="computeroutput"><span class="identifier">v</span><span class="special">.</span><span class="identifier">translate</span><span class="special">(</span><span class="identifier">c</span><span class="special">,</span><span class="keyword">false</span><span class="special">)==</span><span class="identifier">v</span><span class="special">.</span><span class="identifier">translate</span><span class="special">(</span><span class="identifier">d</span><span class="special">,</span><span class="keyword">false</span><span class="special">)</span></tt>. Likewise for all characters C
+                  that are to be considered equivalent to c when comparisons are
+                  to be performed without regard to case, then <tt class="computeroutput"><span class="identifier">v</span><span class="special">.</span><span class="identifier">translate</span><span class="special">(</span><span class="identifier">c</span><span class="special">,</span><span class="keyword">true</span><span class="special">)==</span><span class="identifier">v</span><span class="special">.</span><span class="identifier">translate</span><span class="special">(</span><span class="identifier">C</span><span class="special">,</span><span class="keyword">true</span><span class="special">)</span></tt>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.toi(I1, I2, i)
+                </p>
+                </td>
+<td>
+                <p>
+                  An integer type capable of holding either a charT or an int.
+                </p>
+                </td>
+<td>
+                <p>
+                  Behaves as follows: if <tt class="computeroutput"><span class="identifier">p</span>
+                  <span class="special">==</span> <span class="identifier">q</span></tt>
+                  or if <tt class="computeroutput"><span class="special">*</span><span class="identifier">p</span></tt>
+                  is not a digit character then returns -1. Otherwise performs formatted
+                  numeric input on the sequence [p,q) and returns the result as an
+                  int. Postcondition: either p == q or *p is a non-digit character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.error_string(i)
+                </p>
+                </td>
+<td>
+                <p>
+                  std::string
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a human readable error string for the error condition i,
+                  where i is one of the values enumerated by type regex_constants::error_type.
+                  If the value i is not recognized then returns the string "Unknown
+                  error" or a localized equivalent.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.tolower(c)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::char_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Converts c to lower case, used for Perl-style \l and \L formating
+                  operations.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  v.toupper(c)
+                </p>
+                </td>
+<td>
+                <p>
+                  X::char_type
+                </p>
+                </td>
+<td>
+                <p>
+                  Converts c to upper case, used for Perl-style \u and \U formating
+                  operations.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="charT_concept.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="iterator_concepts.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces.html b/doc/html/boost_regex/ref/deprecated_interfaces.html
new file mode 100644
index 00000000..7d3f52f1
--- /dev/null
+++ b/doc/html/boost_regex/ref/deprecated_interfaces.html
@@ -0,0 +1,61 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Deprecated Interfaces</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="concepts/iterator_concepts.html" title=" Iterator
+        Rrequirements">
+<link rel="next" href="deprecated_interfaces/regex_format.html" title="
+        regex_format (Deprecated)">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="concepts/iterator_concepts.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="deprecated_interfaces/regex_format.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.deprecated_interfaces"></a><a href="deprecated_interfaces.html" title="Deprecated Interfaces">Deprecated Interfaces</a></h3></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="deprecated_interfaces/regex_format.html">
+        regex_format (Deprecated)</a></span></dt>
+<dt><span class="section"><a href="deprecated_interfaces/regex_grep.html">
+        regex_grep (Deprecated)</a></span></dt>
+<dt><span class="section"><a href="deprecated_interfaces/regex_split.html">
+        regex_split (deprecated)</a></span></dt>
+<dt><span class="section"><a href="deprecated_interfaces/old_regex.html"> High
+        Level Class RegEx (Deprecated)</a></span></dt>
+</dl></div>
+<p>
+      </p>
+<p>
+      </p>
+<p>
+      </p>
+<p>
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="concepts/iterator_concepts.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="deprecated_interfaces/regex_format.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
new file mode 100644
index 00000000..ea155135
--- /dev/null
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
@@ -0,0 +1,833 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> High
+        Level Class RegEx (Deprecated)</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../deprecated_interfaces.html" title="Deprecated Interfaces">
+<link rel="prev" href="regex_split.html" title="
+        regex_split (deprecated)">
+<link rel="next" href="../../background_information.html" title="Background Information">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_split.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../background_information.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.deprecated_interfaces.old_regex"></a><a href="old_regex.html" title=" High
+        Level Class RegEx (Deprecated)"> High
+        Level Class RegEx (Deprecated)</a></h4></div></div></div>
+<p>
+          The high level wrapper class RegEx is now deprecated and does not form
+          part of the regular expression standardization proposal. This type still
+          exists, and existing code will continue to compile, however the following
+          documentation is unlikely to be further updated.
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">cregex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+          The class RegEx provides a high level simplified interface to the regular
+          expression library, this class only handles narrow character strings, and
+          regular expressions always follow the "normal" syntax - that
+          is the same as the perl / ECMAScript synatx.
+        </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="keyword">bool</span> <span class="special">(*</span><span class="identifier">GrepCallback</span><span class="special">)(</span><span class="keyword">const</span> <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="identifier">expression</span><span class="special">);</span>
+<span class="keyword">typedef</span> <span class="keyword">bool</span> <span class="special">(*</span><span class="identifier">GrepFileCallback</span><span class="special">)(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">file</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="identifier">expression</span><span class="special">);</span>
+<span class="keyword">typedef</span> <span class="keyword">bool</span> <span class="special">(*</span><span class="identifier">FindFilesCallback</span><span class="special">)(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">file</span><span class="special">);</span>
+
+<span class="keyword">class</span>  <span class="identifier">RegEx</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+   <span class="identifier">RegEx</span><span class="special">();</span>
+   <span class="identifier">RegEx</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="identifier">o</span><span class="special">);</span>
+   <span class="special">~</span><span class="identifier">RegEx</span><span class="special">();</span>
+   <span class="identifier">RegEx</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">c</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">icase</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">);</span>
+   <span class="keyword">explicit</span> <span class="identifier">RegEx</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">icase</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">);</span>
+   <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="identifier">o</span><span class="special">);</span>
+   <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">);</span>
+   <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">SetExpression</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">icase</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">);</span>
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">SetExpression</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">icase</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">);</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">Expression</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="comment">//
+</span>   <span class="comment">// now matching operators: 
+</span>   <span class="comment">// 
+</span>   <span class="keyword">bool</span> <span class="identifier">Match</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+   <span class="keyword">bool</span> <span class="identifier">Match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">bool</span> <span class="identifier">Search</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">bool</span> <span class="identifier">Search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">GrepCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+                     <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">GrepCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                     <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+                     <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                     <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+                     <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                     <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">GrepFiles</span><span class="special">(</span><span class="identifier">GrepFileCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">files</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">recurse</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> 
+                          <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">GrepFiles</span><span class="special">(</span><span class="identifier">GrepFileCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">files</span><span class="special">,</span> 
+                          <span class="keyword">bool</span> <span class="identifier">recurse</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> 
+                          <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">FindFiles</span><span class="special">(</span><span class="identifier">FindFilesCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">files</span><span class="special">,</span> 
+                          <span class="keyword">bool</span> <span class="identifier">recurse</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> 
+                          <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">FindFiles</span><span class="special">(</span><span class="identifier">FindFilesCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">files</span><span class="special">,</span> 
+                          <span class="keyword">bool</span> <span class="identifier">recurse</span> <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> 
+                          <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">Merge</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">in</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">fmt</span><span class="special">,</span> 
+                     <span class="keyword">bool</span> <span class="identifier">copy</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">Merge</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">in</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">fmt</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">copy</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">,</span> 
+                     <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+   <span class="keyword">unsigned</span> <span class="identifier">Split</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">,</span> 
+                  <span class="keyword">unsigned</span> <span class="identifier">max_count</span> <span class="special">=</span> <span class="special">~</span><span class="number">0</span><span class="special">);</span> 
+   <span class="comment">// 
+</span>   <span class="comment">// now operators for returning what matched in more detail: 
+</span>   <span class="comment">// 
+</span>   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Position</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Length</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span> 
+   <span class="keyword">bool</span> <span class="identifier">Matched</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Line</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span> 
+   <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">Marks</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">What</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="keyword">operator</span><span class="special">[](</span><span class="keyword">int</span> <span class="identifier">i</span><span class="special">)</span><span class="keyword">const</span> <span class="special">;</span> 
+
+   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">npos</span><span class="special">;</span>
+<span class="special">};</span>    
+</pre>
+<p>
+          Member functions for class RegEx are defined as follows:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Member
+                </p>
+                </th>
+<th>
+                <p>
+                  Description
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">();</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Default constructor, constructs an instance of RegEx without any
+                  valid expression.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="identifier">o</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Copy constructor, all the properties of parameter <span class="emphasis"><em>o</em></span>
+                  are copied.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">c</span><span class="special">,</span> <span class="keyword">bool</span>
+                  <span class="identifier">icase</span> <span class="special">=</span>
+                  <span class="keyword">false</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Constructs an instance of RegEx, setting the expression to <span class="emphasis"><em>c</em></span>,
+                  if <span class="emphasis"><em>icase</em></span> is true then matching is insensitive
+                  to case, otherwise it is sensitive to case. Throws <a href="../bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> on failure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="keyword">bool</span>
+                  <span class="identifier">icase</span> <span class="special">=</span>
+                  <span class="keyword">false</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Constructs an instance of RegEx, setting the expression to <span class="emphasis"><em>s</em></span>,
+                  if <span class="emphasis"><em>icase</em></span> is true then matching is insensitive
+                  to case, otherwise it is sensitive to case. Throws <a href="../bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> on failure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">&amp;</span>
+                  <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">RegEx</span><span class="special">&amp;</span> <span class="identifier">o</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Default assignment operator.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">&amp;</span>
+                  <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Assignment operator, equivalent to calling <tt class="computeroutput"><span class="identifier">SetExpression</span><span class="special">(</span><span class="identifier">p</span><span class="special">,</span> <span class="keyword">false</span><span class="special">)</span></tt>. Throws <a href="../bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> on failure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">&amp;</span>
+                  <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Assignment operator, equivalent to calling <tt class="computeroutput"><span class="identifier">SetExpression</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="keyword">false</span><span class="special">)</span></tt>. Throws <a href="../bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> on failure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">SetExpression</span><span class="special">(</span><span class="identifier">constchar</span><span class="special">*</span>
+                  <span class="identifier">p</span><span class="special">,</span>
+                  <span class="keyword">bool</span> <span class="identifier">icase</span>
+                  <span class="special">=</span> <span class="keyword">false</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Sets the current expression to <span class="emphasis"><em>p</em></span>, if <span class="emphasis"><em>icase</em></span>
+                  is true then matching is insensitive to case, otherwise it is sensitive
+                  to case. Throws <a href="../bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> on failure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">SetExpression</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="keyword">bool</span>
+                  <span class="identifier">icase</span> <span class="special">=</span>
+                  <span class="keyword">false</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Sets the current expression to <span class="emphasis"><em>s</em></span>, if <span class="emphasis"><em>icase</em></span>
+                  is true then matching is insensitive to case, otherwise it is sensitive
+                  to case. Throws <a href="../bad_expression.html" title=" bad_expression"><tt class="computeroutput"><span class="identifier">bad_expression</span></tt></a> on failure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">Expression</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a copy of the current regular expression.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">bool</span> <span class="identifier">Match</span><span class="special">(</span><span class="keyword">const</span>
+                  <span class="keyword">char</span><span class="special">*</span>
+                  <span class="identifier">p</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Attempts to match the current expression against the text <span class="emphasis"><em>p</em></span>
+                  using the match flags <span class="emphasis"><em>flags</em></span> - see <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>. Returns
+                  <span class="emphasis"><em>true</em></span> if the expression matches the whole of
+                  the input string.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">bool</span> <span class="identifier">Match</span><span class="special">(</span><span class="keyword">const</span>
+                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span>
+                  <span class="identifier">s</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Attempts to match the current expression against the text <span class="emphasis"><em>s</em></span>
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  Returns <span class="emphasis"><em>true</em></span> if the expression matches the
+                  whole of the input string.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">bool</span> <span class="identifier">Search</span><span class="special">(</span><span class="keyword">const</span>
+                  <span class="keyword">char</span><span class="special">*</span>
+                  <span class="identifier">p</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Attempts to find a match for the current expression somewhere in
+                  the text <span class="emphasis"><em>p</em></span> using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  Returns <span class="emphasis"><em>true</em></span> if the match succeeds.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">bool</span> <span class="identifier">Search</span><span class="special">(</span><span class="keyword">const</span>
+                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span>
+                  <span class="identifier">s</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Attempts to find a match for the current expression somewhere in
+                  the text <span class="emphasis"><em>s</em></span> using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> flags.
+                  Returns <span class="emphasis"><em>true</em></span> if the match succeeds.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">GrepCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="keyword">char</span><span class="special">*</span>
+                  <span class="identifier">p</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the text <span class="emphasis"><em>p</em></span>
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each match found calls the call-back function cb as: <tt class="computeroutput"><span class="identifier">cb</span><span class="special">(*</span><span class="keyword">this</span><span class="special">);</span></tt>
+                  If at any stage the call-back function returns <span class="emphasis"><em>false</em></span>
+                  then the grep operation terminates, otherwise continues until no
+                  further matches are found. Returns the number of matches found.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">GrepCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span>
+                  <span class="identifier">s</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the text <span class="emphasis"><em>s</em></span>
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> flags.
+                  For each match found calls the call-back function cb as: <tt class="computeroutput"><span class="identifier">cb</span><span class="special">(*</span><span class="keyword">this</span><span class="special">);</span></tt>
+                  If at any stage the call-back function returns false then the grep
+                  operation terminates, otherwise continues until no further matches
+                  are found. Returns the number of matches found.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;&amp;</span>
+                  <span class="identifier">v</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span>
+                  <span class="identifier">flags</span> <span class="special">=</span>
+                  <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the text <span class="emphasis"><em>p</em></span>
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> flags.
+                  For each match pushes a copy of what matched onto <span class="emphasis"><em>v</em></span>.
+                  Returns the number of matches found.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;&amp;</span>
+                  <span class="identifier">v</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span>
+                  <span class="identifier">flags</span> <span class="special">=</span>
+                  <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the text <span class="emphasis"><em>s</em></span>
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each match pushes a copy of what matched onto <span class="emphasis"><em>v</em></span>.
+                  Returns the number of matches found.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="keyword">char</span><span class="special">*</span>
+                  <span class="identifier">p</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the text <span class="emphasis"><em>p</em></span>
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each match pushes the starting index of what matched onto
+                  <span class="emphasis"><em>v</em></span>. Returns the number of matches found.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span>
+                  <span class="identifier">s</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the text <span class="emphasis"><em>s</em></span>
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each match pushes the starting index of what matched onto
+                  <span class="emphasis"><em>v</em></span>. Returns the number of matches found.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">GrepFiles</span><span class="special">(</span><span class="identifier">GrepFileCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="keyword">char</span><span class="special">*</span>
+                  <span class="identifier">files</span><span class="special">,</span>
+                  <span class="keyword">bool</span> <span class="identifier">recurse</span>
+                  <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span>
+                  <span class="identifier">flags</span> <span class="special">=</span>
+                  <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the files files
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each match calls the call-back function cb. If the call-back
+                  returns false then the algorithm returns without considering further
+                  matches in the current file, or any further files.
+                </p>
+                <p>
+                  The parameter <span class="emphasis"><em>files</em></span> can include wild card
+                  characters '*' and '?', if the parameter recurse is true then searches
+                  sub-directories for matching file names.
+                </p>
+                <p>
+                  Returns the total number of matches found.
+                </p>
+                <p>
+                  May throw an exception derived from <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+                  if file io fails.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">GrepFiles</span><span class="special">(</span><span class="identifier">GrepFileCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span>
+                  <span class="identifier">files</span><span class="special">,</span>
+                  <span class="keyword">bool</span> <span class="identifier">recurse</span>
+                  <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span>
+                  <span class="identifier">flags</span> <span class="special">=</span>
+                  <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Finds all matches of the current expression in the files files
+                  using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each match calls the call-back function cb.
+                </p>
+                <p>
+                  If the call-back returns false then the algorithm returns without
+                  considering further matches in the current file, or any further
+                  files.
+                </p>
+                <p>
+                  The parameter <span class="emphasis"><em>files</em></span> can include wild card
+                  characters '*' and '?', if the parameter recurse is true then searches
+                  sub-directories for matching file names.
+                </p>
+                <p>
+                  Returns the total number of matches found.
+                </p>
+                <p>
+                  May throw an exception derived from <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+                  if file io fails.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">FindFiles</span><span class="special">(</span><span class="identifier">FindFilesCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="keyword">char</span><span class="special">*</span>
+                  <span class="identifier">files</span><span class="special">,</span>
+                  <span class="keyword">bool</span> <span class="identifier">recurse</span>
+                  <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span>
+                  <span class="identifier">flags</span> <span class="special">=</span>
+                  <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Searches files to find all those which contain at least one match
+                  of the current expression using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each matching file calls the call-back function cb. If the
+                  call-back returns false then the algorithm returns without considering
+                  any further files.
+                </p>
+                <p>
+                  The parameter <span class="emphasis"><em>files</em></span> can include wild card
+                  characters '*' and '?', if the parameter <span class="emphasis"><em>recurse</em></span>
+                  is true then searches sub-directories for matching file names.
+                </p>
+                <p>
+                  Returns the total number of files found.
+                </p>
+                <p>
+                  May throw an exception derived from <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+                  if file io fails.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">FindFiles</span><span class="special">(</span><span class="identifier">FindFilesCallback</span> <span class="identifier">cb</span><span class="special">,</span> <span class="keyword">const</span>
+                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span>
+                  <span class="identifier">files</span><span class="special">,</span>
+                  <span class="keyword">bool</span> <span class="identifier">recurse</span>
+                  <span class="special">=</span> <span class="keyword">false</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span>
+                  <span class="identifier">flags</span> <span class="special">=</span>
+                  <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Searches files to find all those which contain at least one match
+                  of the current expression using the <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>flags</em></span>.
+                  For each matching file calls the call-back function cb.
+                </p>
+                <p>
+                  If the call-back returns false then the algorithm returns without
+                  considering any further files.
+                </p>
+                <p>
+                  The parameter <span class="emphasis"><em>files</em></span> can include wild card
+                  characters '*' and '?', if the parameter <span class="emphasis"><em>recurse</em></span>
+                  is true then searches sub-directories for matching file names.
+                </p>
+                <p>
+                  Returns the total number of files found.
+                </p>
+                <p>
+                  May throw an exception derived from <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+                  if file io fails.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">Merge</span><span class="special">(</span><span class="keyword">const</span>
+                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span>
+                  <span class="identifier">in</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">fmt</span><span class="special">,</span> <span class="keyword">bool</span>
+                  <span class="identifier">copy</span> <span class="special">=</span>
+                  <span class="keyword">true</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Performs a search and replace operation: searches through the string
+                  <span class="emphasis"><em>in</em></span> for all occurrences of the current expression,
+                  for each occurrence replaces the match with the format string
+                  <span class="emphasis"><em>fmt</em></span>. Uses <span class="emphasis"><em>flags</em></span> to determine
+                  what gets matched, and how the format string should be treated.
+                  If <span class="emphasis"><em>copy</em></span> is true then all unmatched sections
+                  of input are copied unchanged to output, if the flag <span class="emphasis"><em>format_first_only</em></span>
+                  is set then only the first occurance of the pattern found is replaced.
+                  Returns the new string. See also <a href="../../format.html" title=" Search and Replace Format String Syntax">format
+                  string syntax</a>, and <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">Merge</span><span class="special">(</span><span class="keyword">const</span>
+                  <span class="keyword">char</span><span class="special">*</span>
+                  <span class="identifier">in</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">fmt</span><span class="special">,</span> <span class="keyword">bool</span>
+                  <span class="identifier">copy</span> <span class="special">=</span>
+                  <span class="keyword">true</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span>
+                  <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Performs a search and replace operation: searches through the string
+                  <span class="emphasis"><em>in</em></span> for all occurrences of the current expression,
+                  for each occurrence replaces the match with the format string
+                  <span class="emphasis"><em>fmt</em></span>. Uses <span class="emphasis"><em>flags</em></span> to determine
+                  what gets matched, and how the format string should be treated.
+                  If <span class="emphasis"><em>copy</em></span> is true then all unmatched sections
+                  of input are copied unchanged to output, if the flag <span class="emphasis"><em>format_first_only</em></span>
+                  is set then only the first occurance of the pattern found is replaced.
+                  Returns the new string. See also <a href="../../format.html" title=" Search and Replace Format String Syntax">format
+                  string syntax</a>, and <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="identifier">Split</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;&amp;</span> <span class="identifier">v</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span>
+                  <span class="identifier">flags</span> <span class="special">=</span>
+                  <span class="identifier">match_default</span><span class="special">,</span>
+                  <span class="keyword">unsigned</span> <span class="identifier">max_count</span>
+                  <span class="special">=</span> <span class="special">~</span><span class="number">0</span><span class="special">);</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Splits the input string and pushes each one onto the vector. If
+                  the expression contains no marked sub-expressions, then one string
+                  is outputted for each section of the input that does not match
+                  the expression. If the expression does contain marked sub-expressions,
+                  then outputs one string for each marked sub-expression each time
+                  a match occurs. Outputs no more than <span class="emphasis"><em>max_count</em></span>
+                  strings. Before returning, deletes from the input string <span class="emphasis"><em>s</em></span>
+                  all of the input that has been processed (all of the string if
+                  <span class="emphasis"><em>max_count</em></span> was not reached). Returns the number
+                  of strings pushed onto the vector.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Position</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span>
+                  <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns the position of what matched sub-expression <span class="emphasis"><em>i</em></span>.
+                  If <tt class="computeroutput"><span class="identifier">i</span> <span class="special">=</span>
+                  <span class="number">0</span></tt> then returns the position
+                  of the whole match. Returns <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">::</span><span class="identifier">npos</span></tt>
+                  if the supplied index is invalid, or if the specified sub-expression
+                  did not participate in the match.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Length</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span>
+                  <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns the length of what matched sub-expression i. If <tt class="computeroutput"><span class="identifier">i</span> <span class="special">=</span>
+                  <span class="number">0</span></tt> then returns the length
+                  of the whole match. Returns <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">::</span><span class="identifier">npos</span></tt>
+                  if the supplied index is invalid, or if the specified sub-expression
+                  did not participate in the match.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">bool</span> <span class="identifier">Matched</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span>
+                  <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns true if sub-expression <span class="emphasis"><em>i</em></span> was matched,
+                  false otherwise.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Line</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns the line on which the match occurred, indexes start from
+                  1 not zero, if no match occurred then returns <tt class="computeroutput"><span class="identifier">RegEx</span><span class="special">::</span><span class="identifier">npos</span></tt>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                  <span class="identifier">Marks</span><span class="special">()</span>
+                  <span class="keyword">const</span><span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns the number of marked sub-expressions contained in the expression.
+                  Note that this includes the whole match (sub-expression zero),
+                  so the value returned is always &gt;= 1.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">What</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns a copy of what matched sub-expression <span class="emphasis"><em>i</em></span>.
+                  If <tt class="computeroutput"><span class="identifier">i</span> <span class="special">=</span>
+                  <span class="number">0</span></tt> then returns a copy of
+                  the whole match. Returns a null string if the index is invalid
+                  or if the specified sub-expression did not participate in a match.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="keyword">operator</span><span class="special">[](</span><span class="keyword">int</span>
+                  <span class="identifier">i</span><span class="special">)</span><span class="keyword">const</span> <span class="special">;</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Returns <tt class="computeroutput"><span class="identifier">what</span><span class="special">(</span><span class="identifier">i</span><span class="special">);</span></tt>
+                  Can be used to simplify access to sub-expression matches, and make
+                  usage more perl-like.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_split.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../background_information.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
new file mode 100644
index 00000000..559d3a9e
--- /dev/null
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
@@ -0,0 +1,185 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        regex_format (Deprecated)</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../deprecated_interfaces.html" title="Deprecated Interfaces">
+<link rel="prev" href="../deprecated_interfaces.html" title="Deprecated Interfaces">
+<link rel="next" href="regex_grep.html" title="
+        regex_grep (Deprecated)">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_grep.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.deprecated_interfaces.regex_format"></a><a href="regex_format.html" title="
+        regex_format (Deprecated)">
+        regex_format (Deprecated)</a></h4></div></div></div>
+<p>
+          The algorithm <tt class="computeroutput"><span class="identifier">regex_format</span></tt>
+          is deprecated; new code should use <a href="../match_results.html#boost_regex.match_results_format"><tt class="computeroutput"><span class="identifier">match_results</span><span class="special">&lt;&gt;::</span><span class="identifier">format</span></tt></a> instead. Existing code
+          will continue to compile, the following documentation is taken from the
+          previous version of Boost.Regex and will not be further updated:
+        </p>
+<a name="boost_regex.ref.deprecated_interfaces.regex_format.algorithm_regex_format"></a><h4>
+<a name="id591505"></a>
+          <a href="regex_format.html#boost_regex.ref.deprecated_interfaces.regex_format.algorithm_regex_format">Algorithm
+          regex_format</a>
+        </h4>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+          The algorithm <tt class="computeroutput"><span class="identifier">regex_format</span></tt>
+          takes the results of a match and creates a new string based upon a format
+          string, <tt class="computeroutput"><span class="identifier">regex_format</span></tt> can
+          be used for search and replace operations:
+        </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">iterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">OutputIterator</span> <span class="identifier">regex_format</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">fmt</span><span class="special">,</span>
+                           <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="number">0</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">iterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">OutputIterator</span> <span class="identifier">regex_format</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                           <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="number">0</span><span class="special">);</span>
+</pre>
+<p>
+          The library also defines the following convenience variation of <tt class="computeroutput"><span class="identifier">regex_format</span></tt>, which returns the result
+          directly as a string, rather than outputting to an iterator.
+        </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+            This version may not be available, or may be available in a more limited
+            form, depending upon your compilers capabilities
+          </p></td></tr>
+</table></div>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">iterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="identifier">regex_format</span>
+                                 <span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+                                 <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">fmt</span><span class="special">,</span>
+                                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="number">0</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">iterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="identifier">regex_format</span>
+                                 <span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+                                 <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="number">0</span><span class="special">);</span>
+</pre>
+<p>
+          Parameters to the main version of the function are passed as follows:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Parameter
+                </p>
+                </th>
+<th>
+                <p>
+                  Description
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="identifier">OutputIterator</span> <span class="identifier">out</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  An output iterator type, the output string is sent to this iterator.
+                  Typically this would be a std::ostream_iterator.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  An instance of <a href="../match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> obtained
+                  from one of the matching algorithms above, and denoting what matched.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">fmt</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  A format string that determines how the match is transformed into
+                  the new string.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="identifier">flags</span></tt>
+                </p>
+                </td>
+<td>
+                <p>
+                  Optional flags which describe how the format string is to be interpreted.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+          Format flags are described under <a href="../match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>.
+        </p>
+<p>
+          The format string syntax (and available options) is described more fully
+          under <a href="../../format.html" title=" Search and Replace Format String Syntax">format strings</a>.
+        </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_grep.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
new file mode 100644
index 00000000..13d2a5bf
--- /dev/null
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
@@ -0,0 +1,386 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        regex_grep (Deprecated)</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../deprecated_interfaces.html" title="Deprecated Interfaces">
+<link rel="prev" href="regex_format.html" title="
+        regex_format (Deprecated)">
+<link rel="next" href="regex_split.html" title="
+        regex_split (deprecated)">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_format.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_split.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.deprecated_interfaces.regex_grep"></a><a href="regex_grep.html" title="
+        regex_grep (Deprecated)">
+        regex_grep (Deprecated)</a></h4></div></div></div>
+<p>
+          The algorithm <tt class="computeroutput"><span class="identifier">regex_grep</span></tt>
+          is deprecated in favor of <a href="../regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> which provides
+          a more convenient and standard library friendly interface.
+        </p>
+<p>
+          The following documentation is taken unchanged from the previous boost
+          release, and will not be updated in future.
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+          <tt class="computeroutput"><span class="identifier">regex_grep</span></tt> allows you to
+          search through a bidirectional-iterator range and locate all the (non-overlapping)
+          matches with a given regular expression. The function is declared as:
+        </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Predicate</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">iterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">regex_grep</span><span class="special">(</span><span class="identifier">Predicate</span> <span class="identifier">foo</span><span class="special">,</span>
+                        <span class="identifier">iterator</span> <span class="identifier">first</span><span class="special">,</span>
+                        <span class="identifier">iterator</span> <span class="identifier">last</span><span class="special">,</span>
+                        <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                        <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">)</span>
+</pre>
+<p>
+          The library also defines the following convenience versions, which take
+          either a <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span></tt>, or a <tt class="computeroutput"><span class="keyword">const</span>
+          <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;&gt;&amp;</span></tt>
+          in place of a pair of iterators.
+        </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Predicate</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">regex_grep</span><span class="special">(</span><span class="identifier">Predicate</span> <span class="identifier">foo</span><span class="special">,</span> 
+            <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span> 
+            <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+            <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Predicate</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">regex_grep</span><span class="special">(</span><span class="identifier">Predicate</span> <span class="identifier">foo</span><span class="special">,</span> 
+            <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+            <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+            <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+          The parameters for the primary version of <tt class="computeroutput"><span class="identifier">regex_grep</span></tt>
+          have the following meanings:
+        </p>
+<p>
+          foo: A predicate function object or function pointer, see below for more
+          information.
+        </p>
+<p>
+          first: The start of the range to search.
+        </p>
+<p>
+          last: The end of the range to search.
+        </p>
+<p>
+          e: The regular expression to search for.
+        </p>
+<p>
+          flags: The flags that determine how matching is carried out, one of the
+          match_flags enumerators.
+        </p>
+<p>
+          The algorithm finds all of the non-overlapping matches of the expression
+          <span class="emphasis"><em>e</em></span>, for each match it fills a <tt class="computeroutput"><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">&gt;</span></tt> structure, which contains information
+          on what matched, and calls the predicate <span class="emphasis"><em>foo</em></span>, passing
+          the <tt class="computeroutput"><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">&gt;</span></tt>
+          as a single argument. If the predicate returns <span class="emphasis"><em>true</em></span>,
+          then the grep operation continues, otherwise it terminates without searching
+          for further matches. The function returns the number of matches found.
+        </p>
+<p>
+          The general form of the predicate is:
+        </p>
+<pre class="programlisting">
+<span class="keyword">struct</span> <span class="identifier">grep_predicate</span>
+<span class="special">{</span>
+   <span class="keyword">bool</span> <span class="keyword">operator</span><span class="special">()(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">iterator_type</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+<span class="special">};</span>
+</pre>
+<p>
+          For example the regular expression "a*b" would find one match
+          in the string "aaaaab" and two in the string "aaabb".
+        </p>
+<p>
+          Remember this algorithm can be used for a lot more than implementing a
+          version of grep, the predicate can be and do anything that you want, grep
+          utilities would output the results to the screen, another program could
+          index a file based on a regular expression and store a set of bookmarks
+          in a list, or a text file conversion utility would output to file. The
+          results of one <tt class="computeroutput"><span class="identifier">regex_grep</span></tt>
+          can even be chained into another <tt class="computeroutput"><span class="identifier">regex_grep</span></tt>
+          to create recursive parsers.
+        </p>
+<p>
+          The algorithm may throw <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+          if the complexity of matching the expression against an <span class="emphasis"><em>N</em></span>
+          character string begins to exceed O(N<sup>2</sup>), or if the program runs out of
+          stack space while matching the expression (if Boost.Regex is configured
+          in recursive mode), or if the matcher exhausts it's permitted memory allocation
+          (if Boost.Regex is configured in non-recursive mode).
+        </p>
+<p>
+          Example: convert the example from <a href="../regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a> to use <tt class="computeroutput"><span class="identifier">regex_grep</span></tt> instead:
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">map</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+
+<span class="comment">// IndexClasses: 
+</span><span class="comment">// takes the contents of a file in the form of a string 
+</span><span class="comment">// and searches for all the C++ class definitions, storing 
+</span><span class="comment">// their locations in a map of strings/int's 
+</span><span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">map_type</span><span class="special">;</span> 
+
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">re</span> <span class="special">=</span> 
+   <span class="comment">// possibly leading whitespace:   
+</span>   <span class="string">"^[[:space:]]*"</span> 
+   <span class="comment">// possible template declaration:
+</span>   <span class="string">"(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</span>
+   <span class="comment">// class or struct:
+</span>   <span class="string">"(class|struct)[[:space:]]*"</span> 
+   <span class="comment">// leading declspec macros etc:
+</span>   <span class="string">"("</span>
+      <span class="string">"\\&lt;\\w+\\&gt;"</span>
+      <span class="string">"("</span>
+         <span class="string">"[[:blank:]]*\\([^)]*\\)"</span>
+      <span class="string">")?"</span>
+      <span class="string">"[[:space:]]*"</span>
+   <span class="string">")*"</span> 
+   <span class="comment">// the class name
+</span>   <span class="string">"(\\&lt;\\w*\\&gt;)[[:space:]]*"</span> 
+   <span class="comment">// template specialisation parameters
+</span>   <span class="string">"(&lt;[^;:{]+&gt;)?[[:space:]]*"</span>
+   <span class="comment">// terminate in { or :
+</span>   <span class="string">"(\\{|:[^;\\{()]*\\{)"</span><span class="special">;</span>
+
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">expression</span><span class="special">(</span><span class="identifier">re</span><span class="special">);</span> 
+<span class="keyword">class</span> <span class="identifier">IndexClassesPred</span> 
+<span class="special">{</span> 
+   <span class="identifier">map_type</span><span class="special">&amp;</span> <span class="identifier">m</span><span class="special">;</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">base</span><span class="special">;</span> 
+<span class="keyword">public</span><span class="special">:</span> 
+   <span class="identifier">IndexClassesPred</span><span class="special">(</span><span class="identifier">map_type</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">b</span><span class="special">)</span> <span class="special">:</span> <span class="identifier">m</span><span class="special">(</span><span class="identifier">a</span><span class="special">),</span> <span class="identifier">base</span><span class="special">(</span><span class="identifier">b</span><span class="special">)</span> <span class="special">{}</span> 
+   <span class="keyword">bool</span> <span class="keyword">operator</span><span class="special">()(</span><span class="keyword">const</span>  <span class="identifier">smatch</span><span class="special">&amp;</span> <span class="identifier">what</span><span class="special">)</span> 
+   <span class="special">{</span> 
+      <span class="comment">// what[0] contains the whole string 
+</span>      <span class="comment">// what[5] contains the class name. 
+</span>      <span class="comment">// what[6] contains the template specialisation if any. 
+</span>      <span class="comment">// add class name and position to map: 
+</span>      <span class="identifier">m</span><span class="special">[</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">second</span><span class="special">)</span> <span class="special">+</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">second</span><span class="special">)]</span> <span class="special">=</span> 
+               <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span> <span class="special">-</span> <span class="identifier">base</span><span class="special">;</span> 
+      <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span> 
+   <span class="special">}</span> 
+<span class="special">};</span> 
+<span class="keyword">void</span> <span class="identifier">IndexClasses</span><span class="special">(</span><span class="identifier">map_type</span><span class="special">&amp;</span> <span class="identifier">m</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">file</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">;</span> 
+   <span class="identifier">start</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span> 
+   <span class="identifier">end</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">end</span><span class="special">();</span> 
+   <span class="identifier">regex_grep</span><span class="special">(</span><span class="identifier">IndexClassesPred</span><span class="special">(</span><span class="identifier">m</span><span class="special">,</span> <span class="identifier">start</span><span class="special">),</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">,</span> <span class="identifier">expression</span><span class="special">);</span> 
+<span class="special">}</span>
+</pre>
+<p>
+          Example: Use <tt class="computeroutput"><span class="identifier">regex_grep</span></tt>
+          to call a global callback function:
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">map</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+
+<span class="comment">// purpose: 
+</span><span class="comment">// takes the contents of a file in the form of a string 
+</span><span class="comment">// and searches for all the C++ class definitions, storing 
+</span><span class="comment">// their locations in a map of strings/int's 
+</span><span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">map_type</span><span class="special">;</span> 
+
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">re</span> <span class="special">=</span> 
+   <span class="comment">// possibly leading whitespace:   
+</span>   <span class="string">"^[[:space:]]*"</span> 
+   <span class="comment">// possible template declaration:
+</span>   <span class="string">"(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</span>
+   <span class="comment">// class or struct:
+</span>   <span class="string">"(class|struct)[[:space:]]*"</span> 
+   <span class="comment">// leading declspec macros etc:
+</span>   <span class="string">"("</span>
+      <span class="string">"\\&lt;\\w+\\&gt;"</span>
+      <span class="string">"("</span>
+         <span class="string">"[[:blank:]]*\\([^)]*\\)"</span>
+      <span class="string">")?"</span>
+      <span class="string">"[[:space:]]*"</span>
+   <span class="string">")*"</span> 
+   <span class="comment">// the class name
+</span>   <span class="string">"(\\&lt;\\w*\\&gt;)[[:space:]]*"</span> 
+   <span class="comment">// template specialisation parameters
+</span>   <span class="string">"(&lt;[^;:{]+&gt;)?[[:space:]]*"</span>
+   <span class="comment">// terminate in { or :
+</span>   <span class="string">"(\\{|:[^;\\{()]*\\{)"</span><span class="special">;</span>
+
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">expression</span><span class="special">(</span><span class="identifier">re</span><span class="special">);</span>
+<span class="identifier">map_type</span> <span class="identifier">class_index</span><span class="special">;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">base</span><span class="special">;</span> 
+
+<span class="keyword">bool</span> <span class="identifier">grep_callback</span><span class="special">(</span><span class="keyword">const</span>  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">smatch</span><span class="special">&amp;</span> <span class="identifier">what</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="comment">// what[0] contains the whole string 
+</span>   <span class="comment">// what[5] contains the class name. 
+</span>   <span class="comment">// what[6] contains the template specialisation if any. 
+</span>   <span class="comment">// add class name and position to map: 
+</span>   <span class="identifier">class_index</span><span class="special">[</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">second</span><span class="special">)</span> <span class="special">+</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">second</span><span class="special">)]</span> <span class="special">=</span> 
+               <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span> <span class="special">-</span> <span class="identifier">base</span><span class="special">;</span> 
+   <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span> 
+<span class="special">}</span> 
+<span class="keyword">void</span> <span class="identifier">IndexClasses</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">file</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">;</span> 
+   <span class="identifier">start</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span> 
+   <span class="identifier">end</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">end</span><span class="special">();</span> 
+   <span class="identifier">base</span> <span class="special">=</span> <span class="identifier">start</span><span class="special">;</span> 
+   <span class="identifier">regex_grep</span><span class="special">(</span><span class="identifier">grep_callback</span><span class="special">,</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">,</span> <span class="identifier">expression</span><span class="special">,</span> <span class="identifier">match_default</span><span class="special">);</span> 
+<span class="special">}</span>
+</pre>
+<p>
+          Example: use <tt class="computeroutput"><span class="identifier">regex_grep</span></tt>
+          to call a class member function, use the standard library adapters <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">mem_fun</span></tt> and <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">bind1st</span></tt>
+          to convert the member function into a predicate:
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">map</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">functional</span><span class="special">&gt;</span> 
+<span class="comment">// purpose: 
+</span><span class="comment">// takes the contents of a file in the form of a string 
+</span><span class="comment">// and searches for all the C++ class definitions, storing 
+</span><span class="comment">// their locations in a map of strings/int's 
+</span>
+<span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">map_type</span><span class="special">;</span> 
+<span class="keyword">class</span> <span class="identifier">class_index</span> 
+<span class="special">{</span> 
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">expression</span><span class="special">;</span> 
+   <span class="identifier">map_type</span> <span class="identifier">index</span><span class="special">;</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">base</span><span class="special">;</span> 
+   <span class="keyword">bool</span>  <span class="identifier">grep_callback</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">smatch</span> <span class="identifier">what</span><span class="special">);</span> 
+<span class="keyword">public</span><span class="special">:</span> 
+   <span class="keyword">void</span> <span class="identifier">IndexClasses</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">file</span><span class="special">);</span> 
+   <span class="identifier">class_index</span><span class="special">()</span> 
+      <span class="special">:</span> <span class="identifier">index</span><span class="special">(),</span> 
+      <span class="identifier">expression</span><span class="special">(</span><span class="string">"^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</span> 
+                  <span class="string">"(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?"</span> 
+                  <span class="string">"[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?"</span> 
+                  <span class="string">"(\\{|:[^;\\{()]*\\{)"</span> 
+                  <span class="special">){}</span> 
+<span class="special">};</span> 
+<span class="keyword">bool</span>  <span class="identifier">class_index</span><span class="special">::</span><span class="identifier">grep_callback</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">smatch</span> <span class="identifier">what</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="comment">// what[0] contains the whole string 
+</span>   <span class="comment">// what[5] contains the class name. 
+</span>   <span class="comment">// what[6] contains the template specialisation if any. 
+</span>   <span class="comment">// add class name and position to map: 
+</span>   <span class="identifier">index</span><span class="special">[</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">second</span><span class="special">)</span> <span class="special">+</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">second</span><span class="special">)]</span> <span class="special">=</span> 
+               <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span> <span class="special">-</span> <span class="identifier">base</span><span class="special">;</span> 
+   <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span> 
+<span class="special">}</span> 
+
+<span class="keyword">void</span> <span class="identifier">class_index</span><span class="special">::</span><span class="identifier">IndexClasses</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">file</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">;</span> 
+   <span class="identifier">start</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span> 
+   <span class="identifier">end</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">end</span><span class="special">();</span> 
+   <span class="identifier">base</span> <span class="special">=</span> <span class="identifier">start</span><span class="special">;</span> 
+   <span class="identifier">regex_grep</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">bind1st</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">mem_fun</span><span class="special">(&amp;</span><span class="identifier">class_index</span><span class="special">::</span><span class="identifier">grep_callback</span><span class="special">),</span> <span class="keyword">this</span><span class="special">),</span> 
+            <span class="identifier">start</span><span class="special">,</span> 
+            <span class="identifier">end</span><span class="special">,</span> 
+            <span class="identifier">expression</span><span class="special">);</span> 
+<span class="special">}</span> 
+</pre>
+<p>
+          Finally, C++ Builder users can use C++ Builder's closure type as a callback
+          argument:
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">map</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">functional</span><span class="special">&gt;</span> 
+<span class="comment">// purpose: 
+</span><span class="comment">// takes the contents of a file in the form of a string 
+</span><span class="comment">// and searches for all the C++ class definitions, storing 
+</span><span class="comment">// their locations in a map of strings/int's 
+</span>
+<span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">map_type</span><span class="special">;</span> 
+<span class="keyword">class</span> <span class="identifier">class_index</span> 
+<span class="special">{</span> 
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">expression</span><span class="special">;</span> 
+   <span class="identifier">map_type</span> <span class="identifier">index</span><span class="special">;</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">base</span><span class="special">;</span> 
+   <span class="keyword">typedef</span>  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">smatch</span> <span class="identifier">arg_type</span><span class="special">;</span> 
+   <span class="keyword">bool</span> <span class="identifier">grep_callback</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">arg_type</span><span class="special">&amp;</span> <span class="identifier">what</span><span class="special">);</span> 
+<span class="keyword">public</span><span class="special">:</span> 
+   <span class="keyword">typedef</span> <span class="keyword">bool</span> <span class="special">(</span><span class="identifier">__closure</span><span class="special">*</span> <span class="identifier">grep_callback_type</span><span class="special">)(</span><span class="keyword">const</span> <span class="identifier">arg_type</span><span class="special">&amp;);</span> 
+   <span class="keyword">void</span> <span class="identifier">IndexClasses</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">file</span><span class="special">);</span> 
+   <span class="identifier">class_index</span><span class="special">()</span> 
+      <span class="special">:</span> <span class="identifier">index</span><span class="special">(),</span> 
+      <span class="identifier">expression</span><span class="special">(</span><span class="string">"^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</span> 
+                  <span class="string">"(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?"</span> 
+                  <span class="string">"[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?"</span> 
+                  <span class="string">"(\\{|:[^;\\{()]*\\{)"</span> 
+                  <span class="special">){}</span> 
+<span class="special">};</span> 
+
+<span class="keyword">bool</span> <span class="identifier">class_index</span><span class="special">::</span><span class="identifier">grep_callback</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">arg_type</span><span class="special">&amp;</span> <span class="identifier">what</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="comment">// what[0] contains the whole string    
+</span><span class="comment">// what[5] contains the class name.    
+</span><span class="comment">// what[6] contains the template specialisation if any.    
+</span><span class="comment">// add class name and position to map:    
+</span><span class="identifier">index</span><span class="special">[</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">second</span><span class="special">)</span> <span class="special">+</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">second</span><span class="special">)]</span> <span class="special">=</span> 
+               <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span> <span class="special">-</span> <span class="identifier">base</span><span class="special">;</span> 
+   <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span> 
+<span class="special">}</span> 
+
+<span class="keyword">void</span> <span class="identifier">class_index</span><span class="special">::</span><span class="identifier">IndexClasses</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">file</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">;</span> 
+   <span class="identifier">start</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span> 
+   <span class="identifier">end</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">end</span><span class="special">();</span> 
+   <span class="identifier">base</span> <span class="special">=</span> <span class="identifier">start</span><span class="special">;</span> 
+   <span class="identifier">class_index</span><span class="special">::</span><span class="identifier">grep_callback_type</span> <span class="identifier">cl</span> <span class="special">=</span> <span class="special">&amp;(</span><span class="keyword">this</span><span class="special">-&gt;</span><span class="identifier">grep_callback</span><span class="special">);</span> 
+   <span class="identifier">regex_grep</span><span class="special">(</span><span class="identifier">cl</span><span class="special">,</span> 
+            <span class="identifier">start</span><span class="special">,</span> 
+            <span class="identifier">end</span><span class="special">,</span> 
+            <span class="identifier">expression</span><span class="special">);</span> 
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_format.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_split.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
new file mode 100644
index 00000000..ce02c4a1
--- /dev/null
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
@@ -0,0 +1,172 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        regex_split (deprecated)</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../deprecated_interfaces.html" title="Deprecated Interfaces">
+<link rel="prev" href="regex_grep.html" title="
+        regex_grep (Deprecated)">
+<link rel="next" href="old_regex.html" title=" High
+        Level Class RegEx (Deprecated)">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_grep.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="old_regex.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.deprecated_interfaces.regex_split"></a><a href="regex_split.html" title="
+        regex_split (deprecated)">
+        regex_split (deprecated)</a></h4></div></div></div>
+<p>
+          The algorithm <a href="regex_split.html" title="
+        regex_split (deprecated)"><tt class="computeroutput"><span class="identifier">regex_split</span></tt></a> has been deprecated
+          in favor of the iterator <a href="../regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> which has
+          a more flexible and powerful interface, as well as following the more usual
+          standard library "pull" rather than "push" semantics.
+        </p>
+<p>
+          Code which uses <a href="regex_split.html" title="
+        regex_split (deprecated)"><tt class="computeroutput"><span class="identifier">regex_split</span></tt></a> will continue to compile,
+          the following documentation is taken from a previous Boost.Regex version:
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+</pre>
+<p>
+          Algorithm <a href="regex_split.html" title="
+        regex_split (deprecated)"><tt class="computeroutput"><span class="identifier">regex_split</span></tt></a> performs a similar
+          operation to the perl split operation, and comes in three overloaded forms:
+        </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Alloc1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits2</span><span class="special">&gt;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">regex_split</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span> 
+                        <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits1</span><span class="special">,</span> <span class="identifier">Alloc1</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                        <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits2</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                        <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span><span class="special">,</span>
+                        <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">max_split</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Alloc1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits2</span><span class="special">&gt;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">regex_split</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span> 
+                        <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits1</span><span class="special">,</span> <span class="identifier">Alloc1</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                        <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits2</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                        <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Alloc1</span><span class="special">&gt;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">regex_split</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span> 
+                        <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits1</span><span class="special">,</span> <span class="identifier">Alloc1</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">);</span>
+</pre>
+<p>
+          <span class="bold"><b>Effects</b></span>: Each version of the algorithm
+          takes an output-iterator for output, and a string for input. If the expression
+          contains no marked sub-expressions, then the algorithm writes one string
+          onto the output-iterator for each section of input that does not match
+          the expression. If the expression does contain marked sub-expressions,
+          then each time a match is found, one string for each marked sub-expression
+          will be written to the output-iterator. No more than max_split strings
+          will be written to the output-iterator. Before returning, all the input
+          processed will be deleted from the string <span class="emphasis"><em>s</em></span> (if <span class="emphasis"><em>max_split</em></span>
+          is not reached then all of <span class="emphasis"><em>s</em></span> will be deleted). Returns
+          the number of strings written to the output-iterator. If the parameter
+          <span class="emphasis"><em>max_split</em></span> is not specified then it defaults to <tt class="computeroutput"><span class="identifier">UINT_MAX</span></tt>. If no expression is specified,
+          then it defaults to "\s+", and splitting occurs on whitespace.
+        </p>
+<p>
+          <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+          if the complexity of matching the expression against an N character string
+          begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while
+          matching the expression (if Boost.Regex is configured in recursive mode),
+          or if the matcher exhausts its permitted memory allocation (if Boost.Regex
+          is configured in non-recursive mode).
+        </p>
+<p>
+          <span class="bold"><b>Example</b></span>: the following function will split
+          the input string into a series of tokens, and remove each token from the
+          string <span class="emphasis"><em>s</em></span>:
+        </p>
+<pre class="programlisting">
+<span class="keyword">unsigned</span> <span class="identifier">tokenise</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;&amp;</span> <span class="identifier">l</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">return</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_split</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">back_inserter</span><span class="special">(</span><span class="identifier">l</span><span class="special">),</span> <span class="identifier">s</span><span class="special">);</span>
+<span class="special">}</span>
+</pre>
+<p>
+          Example: the following short program will extract all of the URL's from
+          a html file, and print them out to cout:
+        </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">list</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)\""</span><span class="special">,</span>
+               <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regbase</span><span class="special">::</span><span class="identifier">normal</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regbase</span><span class="special">::</span><span class="identifier">icase</span><span class="special">);</span>
+
+<span class="keyword">void</span> <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">istream</span><span class="special">&amp;</span> <span class="identifier">is</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">s</span><span class="special">.</span><span class="identifier">erase</span><span class="special">();</span>
+   <span class="comment">//
+</span>   <span class="comment">// attempt to grow string buffer to match file size,
+</span>   <span class="comment">// this doesn't always work...
+</span>   <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">rdbuf</span><span class="special">()-&amp;</span><span class="identifier">gtin_avail</span><span class="special">());</span>
+   <span class="keyword">char</span> <span class="identifier">c</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">get</span><span class="special">(</span><span class="identifier">c</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="comment">// use logarithmic growth stategy, in case
+</span>      <span class="comment">// in_avail (above) returned zero:
+</span>      <span class="keyword">if</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">==</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">size</span><span class="special">())</span>
+         <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">*</span> <span class="number">3</span><span class="special">);</span>
+      <span class="identifier">s</span><span class="special">.</span><span class="identifier">append</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="identifier">c</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">**</span> <span class="identifier">argv</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span><span class="special">;</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">l</span><span class="special">;</span>
+
+   <span class="keyword">for</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">1</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">argc</span><span class="special">;</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Findings URL's in "</span> <span class="special">&lt;&lt;</span> <span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="string">":"</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="identifier">s</span><span class="special">.</span><span class="identifier">erase</span><span class="special">();</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ifstream</span> <span class="identifier">is</span><span class="special">(</span><span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]);</span>
+      <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">is</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_split</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">back_inserter</span><span class="special">(</span><span class="identifier">l</span><span class="special">),</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">e</span><span class="special">);</span>
+      <span class="keyword">while</span><span class="special">(</span><span class="identifier">l</span><span class="special">.</span><span class="identifier">size</span><span class="special">())</span>
+      <span class="special">{</span>
+         <span class="identifier">s</span> <span class="special">=</span> <span class="special">*(</span><span class="identifier">l</span><span class="special">.</span><span class="identifier">begin</span><span class="special">());</span>
+         <span class="identifier">l</span><span class="special">.</span><span class="identifier">pop_front</span><span class="special">();</span>
+         <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">s</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="special">}</span>
+   <span class="special">}</span>
+   <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_grep.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../deprecated_interfaces.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="old_regex.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/error_type.html b/doc/html/boost_regex/ref/error_type.html
new file mode 100644
index 00000000..b362c115
--- /dev/null
+++ b/doc/html/boost_regex/ref/error_type.html
@@ -0,0 +1,270 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> error_type</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="match_flag_type.html" title=" match_flag_type">
+<link rel="next" href="regex_traits.html" title=" regex_traits">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="match_flag_type.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_traits.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.error_type"></a><a href="error_type.html" title=" error_type"> error_type</a></h3></div></div></div>
+<a name="boost_regex.ref.error_type.synopsis"></a><h4>
+<a name="id569168"></a>
+        <a href="error_type.html#boost_regex.ref.error_type.synopsis">Synopsis</a>
+      </h4>
+<p>
+        Type error type represents the different types of errors that can be raised
+        by the library when parsing a regular expression.
+      </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span> <span class="keyword">namespace</span> <span class="identifier">regex_constants</span><span class="special">{</span>
+
+<span class="keyword">typedef</span> <span class="identifier">implementation</span><span class="special">-</span><span class="identifier">specific</span><span class="special">-</span><span class="identifier">type</span> <span class="identifier">error_type</span><span class="special">;</span>
+
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_collate</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_ctype</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_escape</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_backref</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_brack</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_paren</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_brace</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_badbrace</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_range</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_space</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_badrepeat</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_complexity</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_stack</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">error_type</span> <span class="identifier">error_bad_pattern</span><span class="special">;</span>
+
+<span class="special">}</span> <span class="comment">// namespace regex_constants
+</span><span class="special">}</span> <span class="comment">// namespace boost
+</span></pre>
+<a name="boost_regex.ref.error_type.description"></a><h4>
+<a name="id569735"></a>
+        <a href="error_type.html#boost_regex.ref.error_type.description">Description</a>
+      </h4>
+<p>
+        The type <tt class="computeroutput"><span class="identifier">error_type</span></tt> is an
+        implementation-specific enumeration type that may take one of the following
+        values:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Constant
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                error_collate
+              </p>
+              </td>
+<td>
+              <p>
+                An invalid collating element was specified in a [[.name.]] block.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_ctype
+              </p>
+              </td>
+<td>
+              <p>
+                An invalid character class name was specified in a [[:name:]] block.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_escape
+              </p>
+              </td>
+<td>
+              <p>
+                An invalid or trailing escape was encountered.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_backref
+              </p>
+              </td>
+<td>
+              <p>
+                A back-reference to a non-existant marked sub-expression was encountered.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_brack
+              </p>
+              </td>
+<td>
+              <p>
+                An invalid character set [...] was encountered.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_paren
+              </p>
+              </td>
+<td>
+              <p>
+                Mismatched '(' and ')'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_brace
+              </p>
+              </td>
+<td>
+              <p>
+                Mismatched '{' and '}'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_badbrace
+              </p>
+              </td>
+<td>
+              <p>
+                Invalid contents of a {...} block.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_range
+              </p>
+              </td>
+<td>
+              <p>
+                A character range was invalid, for example [d-a].
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_space
+              </p>
+              </td>
+<td>
+              <p>
+                Out of memory.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_badrepeat
+              </p>
+              </td>
+<td>
+              <p>
+                An attempt to repeat something that can not be repeated - for example
+                a*+
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_complexity
+              </p>
+              </td>
+<td>
+              <p>
+                The expression became too complex to handle.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_stack
+              </p>
+              </td>
+<td>
+              <p>
+                Out of program stack space.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                error_bad_pattern
+              </p>
+              </td>
+<td>
+              <p>
+                Other unspecified errors.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="match_flag_type.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_traits.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/match_flag_type.html b/doc/html/boost_regex/ref/match_flag_type.html
new file mode 100644
index 00000000..bf5a7e95
--- /dev/null
+++ b/doc/html/boost_regex/ref/match_flag_type.html
@@ -0,0 +1,494 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> match_flag_type</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="syntax_option_type/syntax_option_type_literal.html" title="
+        Options for Literal Strings">
+<link rel="next" href="error_type.html" title=" error_type">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type/syntax_option_type_literal.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="error_type.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.match_flag_type"></a><a href="match_flag_type.html" title=" match_flag_type"> match_flag_type</a></h3></div></div></div>
+<p>
+        The type <tt class="computeroutput"><span class="identifier">match_flag_type</span></tt>
+        is an implementation specific bitmask type (see C++ std 17.3.2.1.2) that
+        controls how a regular expression is matched against a character sequence.
+        The behavior of the format flags is described in more detail in the <a href="../format.html" title=" Search and Replace Format String Syntax">format syntax guide</a>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span> <span class="keyword">namespace</span> <span class="identifier">regex_constants</span><span class="special">{</span>
+
+<span class="keyword">typedef</span> <span class="identifier">implemenation</span><span class="special">-</span><span class="identifier">specific</span><span class="special">-</span><span class="identifier">bitmask</span><span class="special">-</span><span class="identifier">type</span> <span class="identifier">match_flag_type</span><span class="special">;</span>
+
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_default</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_bob</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_eob</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_bol</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_eol</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_bow</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_eow</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_any</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_null</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_continuous</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_partial</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_single_line</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_prev_avail</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_dot_newline</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_not_dot_null</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_posix</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_perl</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_nosubs</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">match_extra</span><span class="special">;</span>
+
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">format_default</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">format_sed</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">format_perl</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">format_literal</span><span class="special">;</span> 
+
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">format_no_copy</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">format_first_only</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">match_flag_type</span> <span class="identifier">format_all</span><span class="special">;</span>
+
+<span class="special">}</span> <span class="comment">// namespace regex_constants
+</span><span class="special">}</span> <span class="comment">// namespace boost
+</span></pre>
+<a name="boost_regex.ref.match_flag_type.description"></a><h4>
+<a name="id568392"></a>
+        <a href="match_flag_type.html#boost_regex.ref.match_flag_type.description">Description</a>
+      </h4>
+<p>
+        The type <tt class="computeroutput"><span class="identifier">match_flag_type</span></tt>
+        is an implementation specific bitmask type (see C++ std 17.3.2.1.2). When
+        matching a regular expression against a sequence of characters [first, last)
+        then setting its elements has the effects listed in the table below:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Element
+              </p>
+              </th>
+<th>
+              <p>
+                Effect if set
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                match_default
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that matching of regular expressions proceeds without any
+                modification of the normal rules used in ECMA-262, ECMAScript Language
+                Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects
+                (FWD.1)
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_bob
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expressions "\A" and "\`"
+                should not match against the sub-sequence [first,first).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_eob
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expressions "\'", "\z" and
+                "\Z" should not match against the sub-sequence [last,last).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_bol
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expression "^" should not be matched
+                against the sub-sequence [first,first).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_eol
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expression "$" should not be matched
+                against the sub-sequence [last,last).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_bow
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expressions "\&lt;" and "\b"
+                should not be matched against the sub-sequence [first,first).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_eow
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expressions "\&gt;" and "\b"
+                should not be matched against the sub-sequence [last,last).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_any
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that if more than one match is possible then any match
+                is an acceptable result: this will still find the leftmost match,
+                but may not find the "best" match at that position. Use
+                this flag if you care about the speed of matching, but don't care
+                what was matched (only whether there is one or not).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_null
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expression can not be matched against an empty
+                sequence.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_continuous
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expression must match a sub-sequence that begins
+                at first.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_partial
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that if no match can be found, then it is acceptable to
+                return a match [from, last) such that from!= last, if there could
+                exist some longer sequence of characters [from,to) of which [from,last)
+                is a prefix, and which would result in a full match. This flag is
+                used when matching incomplete or very long texts, see the partial
+                matches documentation for more information.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_extra
+              </p>
+              </td>
+<td>
+              <p>
+                Instructs the matching engine to retain all available capture information;
+                if a capturing group is repeated then information about every repeat
+                is available via match_results::captures() or sub_match_captures().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_single_line
+              </p>
+              </td>
+<td>
+              <p>
+                Equivalent to the inverse of Perl's m/ modifier; prevents ^ from
+                matching after an embedded newline character (so that it only matches
+                at the start of the text being matched), and $ from matching before
+                an embedded newline (so that it only matches at the end of the text
+                being matched).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_prev_avail
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that --first is a valid iterator position, when this flag
+                is set then the flags match_not_bol and match_not_bow are ignored
+                by the regular expression algorithms (RE.7) and iterators (RE.8).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_dot_newline
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expression "." does not match a newline
+                character. This is the inverse of Perl's s/ modifier.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_not_dot_null
+              </p>
+              </td>
+<td>
+              <p>
+                Specified that the expression "." does not match a character
+                null '\0'.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_posix
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expression should be matched according to the
+                POSIX <a href="../syntax/leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule">leftmost-longest
+                rule</a>, regardless of what kind of expression was compiled.
+                Be warned that these rules do not work well with many Perl-specific
+                features such as non-greedy repeats.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_perl
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that the expression should be matched according to the
+                <a href="../syntax/perl_syntax.html#boost_regex.syntax.perl_syntax.what_gets_matched">Perl
+                matching rules</a>, irrespective of what kind of expression was
+                compiled.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                match_nosubs
+              </p>
+              </td>
+<td>
+              <p>
+                Makes the expression behave as if it had no marked subexpressions,
+                no matter how many capturing groups are actually present. The <a href="match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>
+                class will only contain information about the overall match, and
+                not any sub-expressions.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                format_default
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that when a regular expression match is to be replaced
+                by a new string, that the new string is constructed using the rules
+                used by the ECMAScript replace function in ECMA-262, ECMAScript Language
+                Specification, Chapter 15 part 5.4.11 String.prototype.replace. (FWD.1).
+              </p>
+              <p>
+                This is functionally identical to the <a href="../format/perl_format.html" title=" Perl Format String Syntax">Perl
+                format string rules</a>.
+              </p>
+              <p>
+                In addition during search and replace operations then all non-overlapping
+                occurrences of the regular expression are located and replaced, and
+                sections of the input that did not match the expression, are copied
+                unchanged to the output string.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                format_sed
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that when a regular expression match is to be replaced
+                by a new string, that the new string is constructed using the rules
+                used by the Unix sed utility in IEEE Std 1003.1-2001, Portable Operating
+                SystemInterface (POSIX ), Shells and Utilities. See also the <a href="../format/sed_format.html" title=" Sed Format String Syntax">Sed Format string reference</a>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                format_perl
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that when a regular expression match is to be replaced
+                by a new string, that the new string is constructed using <a href="../format/perl_format.html" title=" Perl Format String Syntax">the
+                same rules as Perl 5</a>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                format_literal
+              </p>
+              </td>
+<td>
+              <p>
+                Specified that when a regular expression match is to be replaced
+                by a new string, that the new string is a literal copy of the replacement
+                text.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                format_all
+              </p>
+              </td>
+<td>
+              <p>
+                Specifies that all syntax extensions are enabled, including conditional
+                (?ddexpression1:expression2) replacements: see the <a href="../format/boost_format_syntax.html" title=" Boost-Extended
+      Format String Syntax">format
+                string guide</a> for more details.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                format_no_copy
+              </p>
+              </td>
+<td>
+              <p>
+                When specified during a search and replace operation, then sections
+                of the character container sequence being searched that do match
+                the regular expression, are not copied to the output string.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                format_first_only
+              </p>
+              </td>
+<td>
+              <p>
+                When specified during a search and replace operation, then only the
+                first occurrence of the regular expression is replaced.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type/syntax_option_type_literal.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="error_type.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/match_results.html b/doc/html/boost_regex/ref/match_results.html
new file mode 100644
index 00000000..2e6fca10
--- /dev/null
+++ b/doc/html/boost_regex/ref/match_results.html
@@ -0,0 +1,644 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> match_results</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="basic_regex.html" title=" basic_regex">
+<link rel="next" href="sub_match.html" title=" sub_match">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="basic_regex.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="sub_match.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.match_results"></a><a href="match_results.html" title=" match_results"> match_results</a></h3></div></div></div>
+<a name="boost_regex.ref.match_results.synopsis"></a><h4>
+<a name="id498310"></a>
+        <a href="match_results.html#boost_regex.ref.match_results.synopsis">Synopsis</a>
+      </h4>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+        Regular expressions are different from many simple pattern-matching algorithms
+        in that as well as finding an overall match they can also produce sub-expression
+        matches: each sub-expression being delimited in the pattern by a pair of
+        parenthesis (...). There has to be some method for reporting sub-expression
+        matches back to the user: this is achieved this by defining a class <tt class="computeroutput"><span class="identifier">match_results</span></tt> that acts as an indexed collection
+        of sub-expression matches, each sub-expression match being contained in an
+        object of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>.
+      </p>
+<p>
+        Template class <tt class="computeroutput"><span class="identifier">match_results</span></tt>
+        denotes a collection of character sequences representing the result of a
+        regular expression match. Objects of type <tt class="computeroutput"><span class="identifier">match_results</span></tt>
+        are passed to the algorithms <a href="regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a> and <a href="regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>, and are returned by
+        the iterator <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>. Storage for the
+        collection is allocated and freed as necessary by the member functions of
+        class <tt class="computeroutput"><span class="identifier">match_results</span></tt>.
+      </p>
+<p>
+        The template class <tt class="computeroutput"><span class="identifier">match_results</span></tt>
+        conforms to the requirements of a Sequence, as specified in (lib.sequence.reqmts),
+        except that only operations defined for const-qualified Sequences are supported.
+      </p>
+<p>
+        Class template <tt class="computeroutput"><span class="identifier">match_results</span></tt>
+        is most commonly used as one of the typedefs <tt class="computeroutput"><span class="identifier">cmatch</span></tt>,
+        <tt class="computeroutput"><span class="identifier">wcmatch</span></tt>, <tt class="computeroutput"><span class="identifier">smatch</span></tt>,
+        or <tt class="computeroutput"><span class="identifier">wsmatch</span></tt>:
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span>
+         <span class="keyword">class</span> <span class="identifier">Allocator</span> <span class="special">=</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">allocator</span><span class="special">&lt;</span><span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">match_results</span><span class="special">;</span>
+
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span>              <span class="identifier">cmatch</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span>           <span class="identifier">wcmatch</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span>   <span class="identifier">smatch</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">wstring</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span>  <span class="identifier">wsmatch</span><span class="special">;</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span>
+         <span class="keyword">class</span> <span class="identifier">Allocator</span> <span class="special">=</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">allocator</span><span class="special">&lt;</span><span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">match_results</span>
+<span class="special">{</span> 
+<span class="keyword">public</span><span class="special">:</span> 
+   <span class="keyword">typedef</span>          <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>                        <span class="identifier">value_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">&amp;</span>                                       <span class="identifier">const_reference</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">const_reference</span>                                         <span class="identifier">reference</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">implementation</span> <span class="identifier">defined</span>                                  <span class="identifier">const_iterator</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">const_iterator</span>                                          <span class="identifier">iterator</span><span class="special">;</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">difference_type</span> <span class="identifier">difference_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">Allocator</span><span class="special">::</span><span class="identifier">size_type</span>                                    <span class="identifier">size_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">Allocator</span>                                               <span class="identifier">allocator_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span>      <span class="identifier">char_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">char_type</span><span class="special">&gt;</span>                                 <span class="identifier">string_type</span><span class="special">;</span>
+
+   <span class="comment">// construct/copy/destroy:
+</span>   <a href="match_results.html#boost_regex.match_results.construct">explicit match_results</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">Allocator</span><span class="special">&amp;</span> <span class="identifier">a</span> <span class="special">=</span> <span class="identifier">Allocator</span><span class="special">());</span>
+   <a href="match_results.html#boost_regex.match_results.copy_construct">match_results</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+   <a href="match_results.html#boost_regex.match_results.assign">match_results&amp; operator=</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&amp;</span> <span class="identifier">m</span><span class="special">);</span> 
+   <span class="special">~</span><span class="identifier">match_results</span><span class="special">();</span>
+
+   <span class="comment">// size:
+</span>   <span class="identifier">size_type</span> <a href="match_results.html#boost_regex.match_results.size">size</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">size_type</span> <a href="match_results.html#boost_regex.match_results.max_size">max_size</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">bool</span> <a href="match_results.html#boost_regex.match_results.empty">empty</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="comment">// element access:
+</span>   <span class="identifier">difference_type</span> <a href="match_results.html#boost_regex.match_results.length">length</a><span class="special">(</span><span class="keyword">int</span> <span class="identifier">sub</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">difference_type</span> <a href="match_results.html#boost_regex.match_results.position">position</a><span class="special">(</span><span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">sub</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">string_type</span> <a href="match_results.html#boost_regex.match_results.str">str</a><span class="special">(</span><span class="keyword">int</span> <span class="identifier">sub</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">const_reference</span> <a href="match_results.html#boost_regex.match_results.subscript">operator[]</a><span class="special">(</span><span class="keyword">int</span> <span class="identifier">n</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+
+   <span class="identifier">const_reference</span> <a href="match_results.html#boost_regex.match_results.prefix">prefix</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+
+   <span class="identifier">const_reference</span> <a href="match_results.html#boost_regex.match_results.suffix">suffix</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">const_iterator</span> <a href="match_results.html#boost_regex.match_results.begin">begin</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">const_iterator</span> <a href="match_results.html#boost_regex.match_results.end">end</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="comment">// format:
+</span>   <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">&gt;</span>
+   <span class="identifier">OutputIterator</span> <a href="match_results.html#boost_regex.match_results.format">format</a><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span>
+                        <span class="keyword">const</span> <span class="identifier">string_type</span><span class="special">&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                        <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">format_default</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">string_type</span> <a href="match_results.html#boost_regex.match_results.format2">format</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">string_type</span><span class="special">&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                     <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">format_default</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+
+   <span class="identifier">allocator_type</span> <a href="match_results.html#boost_regex.match_results.get_allocator">get_allocator</a><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">void</span> <a href="match_results.html#boost_regex.match_results.swap">swap</a><span class="special">(</span><span class="identifier">match_results</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">);</span>
+
+<span class="preprocessor">#ifdef</span> <span class="identifier">BOOST_REGEX_MATCH_EXTRA</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">value_type</span><span class="special">::</span><span class="identifier">capture_sequence_type</span> <span class="identifier">capture_sequence_type</span><span class="special">;</span>
+   <span class="keyword">const</span> <span class="identifier">capture_sequence_type</span><span class="special">&amp;</span> <a href="match_results.html#boost_regex.match_results.captures">captures</a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">i</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+<span class="preprocessor">#endif</span>
+
+<span class="special">};</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="match_results.html#boost_regex.match_results.op_eq">operator ==</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="match_results.html#boost_regex.match_results.op_ne">operator !=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span>
+   <a href="match_results.html#boost_regex.match_results.op_stream">operator &lt;&lt;</a> <span class="special">(</span><span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">os</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="keyword">void</span> <a href="match_results.html#boost_regex.match_results.op_swap">swap</a><span class="special">(</span><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+         <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.ref.match_results.description"></a><h4>
+<a name="id501232"></a>
+        <a href="match_results.html#boost_regex.ref.match_results.description">Description</a>
+      </h4>
+<p>
+        In all <tt class="computeroutput"><span class="identifier">match_results</span></tt> constructors,
+        a copy of the Allocator argument is used for any memory allocation performed
+        by the constructor or member functions during the lifetime of the object.
+      </p>
+<a name="boost_regex.match_results.construct"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">match_results</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">Allocator</span><span class="special">&amp;</span> <span class="identifier">a</span> <span class="special">=</span> <span class="identifier">Allocator</span><span class="special">());</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class
+        <tt class="computeroutput"><span class="identifier">match_results</span></tt>. The postconditions
+        of this function are indicated in the table:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Element
+              </p>
+              </th>
+<th>
+              <p>
+                Value
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                empty()
+              </p>
+              </td>
+<td>
+              <p>
+                true
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                size()
+              </p>
+              </td>
+<td>
+              <p>
+                0
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                str()
+              </p>
+              </td>
+<td>
+              <p>
+                basic_string&lt;charT&gt;()
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.match_results.copy_construct"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">match_results</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object of class match_results,
+        as a copy of m.
+      </p>
+<a name="boost_regex.match_results.assign"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">match_results</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Assigns m to *this. The postconditions
+        of this function are indicated in the table:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Element
+              </p>
+              </th>
+<th>
+              <p>
+                Value
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                empty()
+              </p>
+              </td>
+<td>
+              <p>
+                m.empty().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                size()
+              </p>
+              </td>
+<td>
+              <p>
+                m.size().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                str(n)
+              </p>
+              </td>
+<td>
+              <p>
+                m.str(n) for all integers n &lt; m.size().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                prefix()
+              </p>
+              </td>
+<td>
+              <p>
+                m.prefix().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                suffix()
+              </p>
+              </td>
+<td>
+              <p>
+                m.suffix().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                (*this)[n]
+              </p>
+              </td>
+<td>
+              <p>
+                m[n] for all integers n &lt; m.size().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                length(n)
+              </p>
+              </td>
+<td>
+              <p>
+                m.length(n) for all integers n &lt; m.size().
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                position(n)
+              </p>
+              </td>
+<td>
+              <p>
+                m.position(n) for all integers n &lt; m.size().
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.match_results.size"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">size_type</span> <span class="identifier">size</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the number of <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> elements stored in *this;
+        that is the number of marked sub-expressions in the regular expression that
+        was matched plus one.
+      </p>
+<a name="boost_regex.match_results.max_size"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">size_type</span> <span class="identifier">max_size</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the maximum number of
+        <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        elements that can be stored in *this.
+      </p>
+<a name="boost_regex.match_results.empty"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="identifier">empty</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns size() == 0.
+      </p>
+<a name="boost_regex.match_results.length"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">difference_type</span> <span class="identifier">length</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">sub</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the length of sub-expression
+        <span class="emphasis"><em>sub</em></span>, that is to say: <tt class="computeroutput"><span class="special">(*</span><span class="keyword">this</span><span class="special">)[</span><span class="identifier">sub</span><span class="special">].</span><span class="identifier">length</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.match_results.position"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">difference_type</span> <span class="identifier">position</span><span class="special">(</span><span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">sub</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the starting location of
+        sub-expression <span class="emphasis"><em>sub</em></span>, or -1 if <span class="emphasis"><em>sub</em></span>
+        was not matched. Note that if this represents a partial match , then <tt class="computeroutput"><span class="identifier">position</span><span class="special">()</span></tt>
+        will return the location of the partial match even though <tt class="computeroutput"><span class="special">(*</span><span class="keyword">this</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">matched</span></tt>
+        is false.
+      </p>
+<a name="boost_regex.match_results.str"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">string_type</span> <span class="identifier">str</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">sub</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns sub-expression <span class="emphasis"><em>sub</em></span>
+        as a string: <tt class="computeroutput"><span class="identifier">string_type</span><span class="special">((*</span><span class="keyword">this</span><span class="special">)[</span><span class="identifier">sub</span><span class="special">])</span></tt>.
+      </p>
+<a name="boost_regex.match_results.subscript"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">const_reference</span> <span class="keyword">operator</span><span class="special">[](</span><span class="keyword">int</span> <span class="identifier">n</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a reference to the <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        object representing the character sequence that matched marked sub-expression
+        <span class="emphasis"><em>n</em></span>. If <tt class="computeroutput"><span class="identifier">n</span> <span class="special">==</span> <span class="number">0</span></tt> then returns
+        a reference to a <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> object representing the
+        character sequence that matched the whole regular expression. If <span class="emphasis"><em>n</em></span>
+        is out of range, or if <span class="emphasis"><em>n</em></span> is an unmatched sub-expression,
+        then returns a <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        object whose matched member is false.
+      </p>
+<a name="boost_regex.match_results.prefix"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">const_reference</span> <span class="identifier">prefix</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a reference to the <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        object representing the character sequence from the start of the string being
+        matched or searched, to the start of the match found.
+      </p>
+<a name="boost_regex.match_results.suffix"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">const_reference</span> <span class="identifier">suffix</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a reference to the <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        object representing the character sequence from the end of the match found
+        to the end of the string being matched or searched.
+      </p>
+<a name="boost_regex.match_results.begin"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">const_iterator</span> <span class="identifier">begin</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a starting iterator that
+        enumerates over all the marked sub-expression matches stored in *this.
+      </p>
+<a name="boost_regex.match_results.end"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">const_iterator</span> <span class="identifier">end</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a terminating iterator
+        that enumerates over all the marked sub-expression matches stored in *this.
+      </p>
+<a name="boost_regex.match_results_format"></a><a name="boost_regex.match_results.format"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">&gt;</span>
+<span class="identifier">OutputIterator</span> <span class="identifier">format</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span>
+                     <span class="keyword">const</span> <span class="identifier">string_type</span><span class="special">&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                     <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">format_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: The type <tt class="computeroutput"><span class="identifier">OutputIterator</span></tt>
+        conforms to the Output Iterator requirements (C++ std 24.1.2).
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Copies the character sequence
+        <tt class="computeroutput"><span class="special">[</span><span class="identifier">fmt</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">fmt</span><span class="special">.</span><span class="identifier">end</span><span class="special">())</span></tt>
+        to <tt class="computeroutput"><span class="identifier">OutputIterator</span></tt> <span class="emphasis"><em>out</em></span>.
+        For each format specifier or escape sequence in <span class="emphasis"><em>fmt</em></span>,
+        replace that sequence with either the character(s) it represents, or the
+        sequence of characters within <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> to which it refers. The bitmasks specified
+        in flags determines what format specifiers or escape sequences are recognized,
+        by default this is the format used by ECMA-262, ECMAScript Language Specification,
+        Chapter 15 part 5.4.11 String.prototype.replace.
+      </p>
+<p>
+        See the <a href="../format.html" title=" Search and Replace Format String Syntax">format syntax guide for more information</a>.
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: out.
+      </p>
+<a name="boost_regex.match_results.format2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">string_type</span> <span class="identifier">format</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">string_type</span><span class="special">&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">format_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a copy of the string <span class="emphasis"><em>fmt</em></span>.
+        For each format specifier or escape sequence in <span class="emphasis"><em>fmt</em></span>,
+        replace that sequence with either the character(s) it represents, or the
+        sequence of characters within <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> to which it refers. The bitmasks specified
+        in flags determines what format specifiers or escape sequences are recognized,
+        by default this is the format used by ECMA-262, ECMAScript Language Specification,
+        Chapter 15 part 5.4.11 String.prototype.replace.
+      </p>
+<p>
+        See the <a href="../format.html" title=" Search and Replace Format String Syntax">format syntax guide for more information</a>.
+      </p>
+<a name="boost_regex.match_results.get_allocator"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">allocator_type</span> <span class="identifier">get_allocator</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns a copy of the Allocator
+        that was passed to the object's constructor.
+      </p>
+<a name="boost_regex.match_results.swap"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">void</span> <span class="identifier">swap</span><span class="special">(</span><span class="identifier">match_results</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Swaps the contents of the two sequences.
+      </p>
+<p>
+        <span class="bold"><b>Postcondition</b></span>: *this contains the sequence
+        of matched sub-expressions that were in that, that contains the sequence
+        of matched sub-expressions that were in *this.
+      </p>
+<p>
+        <span class="bold"><b>Complexity</b></span>: constant time.
+      </p>
+<a name="boost_regex.match_results.capture_type"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">value_type</span><span class="special">::</span><span class="identifier">capture_sequence_type</span> <span class="identifier">capture_sequence_type</span><span class="special">;</span>
+</pre>
+<p>
+        Defines an implementation-specific type that satisfies the requirements of
+        a standard library Sequence (21.1.1 including the optional Table 68 operations),
+        whose value_type is a <tt class="computeroutput"><span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span></tt>. This type happens to be <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> <span class="special">&gt;</span></tt>,
+        but you shouldn't actually rely on that.
+      </p>
+<a name="boost_regex.match_results.captures"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">const</span> <span class="identifier">capture_sequence_type</span><span class="special">&amp;</span> <span class="identifier">captures</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">i</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns a sequence containing all
+        the captures obtained for sub-expression i.
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: <tt class="computeroutput"><span class="special">(*</span><span class="keyword">this</span><span class="special">)[</span><span class="identifier">i</span><span class="special">].</span><span class="identifier">captures</span><span class="special">();</span></tt>
+      </p>
+<p>
+        <span class="bold"><b>Preconditions</b></span>: the library must be built
+        and used with BOOST_REGEX_MATCH_EXTRA defined, and you must pass the flag
+        match_extra to the regex matching functions ( <a href="regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>, <a href="regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>, <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> or <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a>) in order for
+        this member function to be defined and return useful information.
+      </p>
+<p>
+        <span class="bold"><b>Rationale</b></span>: Enabling this feature has several
+        consequences:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          sub_match occupies more memory resulting in complex expressions running
+          out of memory or stack space more quickly during matching.
+        </li>
+<li>
+          The matching algorithms are less efficient at handling some features (independent
+          sub-expressions for example), even when match_extra is not used.
+        </li>
+<li>
+          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.
+        </li>
+</ul></div>
+<a name="boost_regex.match_results.op_eq"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Compares the two sequences for
+        equality.
+      </p>
+<a name="boost_regex.match_results.op_ne"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Compares the two sequences for
+        inequality.
+      </p>
+<a name="boost_regex.match_results.op_stream"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span>
+   <span class="keyword">operator</span> <span class="special">&lt;&lt;</span> <span class="special">(</span><span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">os</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Writes the contents of <span class="emphasis"><em>m</em></span>
+        to the stream <span class="emphasis"><em>os</em></span> as if by calling <tt class="computeroutput"><span class="identifier">os</span>
+        <span class="special">&lt;&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>;
+        Returns <span class="emphasis"><em>os</em></span>.
+      </p>
+<a name="boost_regex.match_results.op_swap"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+<span class="keyword">void</span> <span class="identifier">swap</span><span class="special">(</span><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+         <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Swaps the contents of the two sequences.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="basic_regex.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="sub_match.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/non_std_strings.html b/doc/html/boost_regex/ref/non_std_strings.html
new file mode 100644
index 00000000..5d2f434d
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings.html
@@ -0,0 +1,90 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Interfacing With Non-Standard
+      String Types</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="regex_traits.html" title=" regex_traits">
+<link rel="next" href="non_std_strings/icu.html" title=" Working With
+        Unicode and ICU String Types">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_traits.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="non_std_strings/icu.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.non_std_strings"></a><a href="non_std_strings.html" title=" Interfacing With Non-Standard
+      String Types"> Interfacing With Non-Standard
+      String Types</a></h3></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="non_std_strings/icu.html"> Working With
+        Unicode and ICU String Types</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="non_std_strings/icu/intro.html"> Introduction
+          to using Regex with ICU</a></span></dt>
+<dt><span class="section"><a href="non_std_strings/icu/unicode_types.html">
+          Unicode regular expression types</a></span></dt>
+<dt><span class="section"><a href="non_std_strings/icu/unicode_algo.html">
+          Unicode Regular Expression Algorithms</a></span></dt>
+<dt><span class="section"><a href="non_std_strings/icu/unicode_iter.html">
+          Unicode Aware Regex Iterators</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="non_std_strings/mfc_strings.html"> Using
+        Boost Regex With MFC Strings</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="non_std_strings/mfc_strings/mfc_intro.html">
+          Introduction to Boost.Regex and MFC Strings</a></span></dt>
+<dt><span class="section"><a href="non_std_strings/mfc_strings/mfc_regex_types.html">
+          Regex Types Used With MFC Strings</a></span></dt>
+<dt><span class="section"><a href="non_std_strings/mfc_strings/mfc_regex_create.html">
+          Regular Expression Creation From an MFC String</a></span></dt>
+<dt><span class="section"><a href="non_std_strings/mfc_strings/mfc_algo.html">
+          Overloaded Algorithms For MFC String Types</a></span></dt>
+<dt><span class="section"><a href="non_std_strings/mfc_strings/mfc_iter.html">
+          Iterating Over the Matches Within An MFC String</a></span></dt>
+</dl></dd>
+</dl></div>
+<p>
+        The Boost.Regex algorithms and iterators are all iterator-based, with convenience
+        overloads of the algorithms provided that convert standard library string
+        types to iterator pairs internally. If you want to search a non-standard
+        string type then the trick is to convert that string into an iterator pair:
+        so far I haven't come across any string types that can't be handled this
+        way, even if they're not officially iterator based. Certainly any string
+        type that provides access to it's internal buffer, along with it's length,
+        can be converted into a pair of pointers (which can be used as iterators).
+      </p>
+<p>
+        Some non-standard string types are sufficiently common that wappers have
+        been provided for them already: currently this includes the ICU and MFC string
+        class types.
+      </p>
+<p>
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_traits.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="non_std_strings/icu.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu.html b/doc/html/boost_regex/ref/non_std_strings/icu.html
new file mode 100644
index 00000000..83799cc1
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/icu.html
@@ -0,0 +1,57 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Working With
+        Unicode and ICU String Types</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../non_std_strings.html" title=" Interfacing With Non-Standard
+      String Types">
+<link rel="prev" href="../non_std_strings.html" title=" Interfacing With Non-Standard
+      String Types">
+<link rel="next" href="icu/intro.html" title=" Introduction
+          to using Regex with ICU">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../non_std_strings.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../non_std_strings.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="icu/intro.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.non_std_strings.icu"></a><a href="icu.html" title=" Working With
+        Unicode and ICU String Types"> Working With
+        Unicode and ICU String Types</a></h4></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="icu/intro.html"> Introduction
+          to using Regex with ICU</a></span></dt>
+<dt><span class="section"><a href="icu/unicode_types.html">
+          Unicode regular expression types</a></span></dt>
+<dt><span class="section"><a href="icu/unicode_algo.html">
+          Unicode Regular Expression Algorithms</a></span></dt>
+<dt><span class="section"><a href="icu/unicode_iter.html">
+          Unicode Aware Regex Iterators</a></span></dt>
+</dl></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../non_std_strings.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../non_std_strings.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="icu/intro.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..87fe0850
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
@@ -0,0 +1,80 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Introduction
+          to using Regex with ICU</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../icu.html" title=" Working With
+        Unicode and ICU String Types">
+<link rel="prev" href="../icu.html" title=" Working With
+        Unicode and ICU String Types">
+<link rel="next" href="unicode_types.html" title="
+          Unicode regular expression types">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../icu.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode_types.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.icu.intro"></a><a href="intro.html" title=" Introduction
+          to using Regex with ICU"> Introduction
+          to using Regex with ICU</a></h5></div></div></div>
+<p>
+            The header:
+          </p>
+<pre class="programlisting">
+<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">icu</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+            contains the data types and algorithms necessary for working with regular
+            expressions in a Unicode aware environment.
+          </p>
+<p>
+            In order to use this header you will need the <a href="http://www.ibm.com/software/globalization/icu/" target="_top">ICU
+            library</a>, and you will need to have built the Boost.Regex library
+            with <a href="../../../install.html#boost_regex.install.building_with_unicode_and_icu_support">ICU
+            support enabled</a>.
+          </p>
+<p>
+            The header will enable you to:
+          </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+              Create regular expressions that treat Unicode strings as sequences
+              of UTF-32 code points.
+            </li>
+<li>
+              Create regular expressions that support various Unicode data properties,
+              including character classification.
+            </li>
+<li>
+              Transparently search Unicode strings that are encoded as either UTF-8,
+              UTF-16 or UTF-32.
+            </li>
+</ul></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../icu.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode_types.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..5d4ae06e
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
@@ -0,0 +1,187 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Unicode Regular Expression Algorithms</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../icu.html" title=" Working With
+        Unicode and ICU String Types">
+<link rel="prev" href="unicode_types.html" title="
+          Unicode regular expression types">
+<link rel="next" href="unicode_iter.html" title="
+          Unicode Aware Regex Iterators">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="unicode_types.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode_iter.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.icu.unicode_algo"></a><a href="unicode_algo.html" title="
+          Unicode Regular Expression Algorithms">
+          Unicode Regular Expression Algorithms</a></h5></div></div></div>
+<p>
+            The regular expression algorithms <a href="../../regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>, <a href="../../regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a> and <a href="../../regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a> all expect that
+            the character sequence upon which they operate, is encoded in the same
+            character encoding as the regular expression object with which they are
+            used. For Unicode regular expressions that behavior is undesirable: while
+            we may want to process the data in UTF-32 "chunks", the actual
+            data is much more likely to encoded as either UTF-8 or UTF-16. Therefore
+            the header &lt;boost/regex/icu.hpp&gt; provides a series of thin wrappers
+            around these algorithms, called <tt class="computeroutput"><span class="identifier">u32regex_match</span></tt>,
+            <tt class="computeroutput"><span class="identifier">u32regex_search</span></tt>, and
+            <tt class="computeroutput"><span class="identifier">u32regex_replace</span></tt>. These
+            wrappers use iterator-adapters internally to make external UTF-8 or UTF-16
+            data look as though it's really a UTF-32 sequence, that can then be passed
+            on to the "real" algorithm.
+          </p>
+<a name="boost_regex.ref.non_std_strings.icu.unicode_algo.u32regex_match"></a><h4>
+<a name="id572213"></a>
+            <a href="unicode_algo.html#boost_regex.ref.non_std_strings.icu.unicode_algo.u32regex_match">u32regex_match</a>
+          </h4>
+<p>
+            For each <a href="../../regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>
+            algorithm defined by <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>,
+            then <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">icu</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt> defines an overloaded algorithm that
+            takes the same arguments, but which is called <tt class="computeroutput"><span class="identifier">u32regex_match</span></tt>,
+            and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as
+            an ICU UnicodeString as input.
+          </p>
+<p>
+            Example: match a password, encoded in a UTF-16 UnicodeString:
+          </p>
+<pre class="programlisting">
+<span class="comment">//
+</span><span class="comment">// Find out if *password* meets our password requirements,
+</span><span class="comment">// as defined by the regular expression *requirements*.
+</span><span class="comment">//
+</span><span class="keyword">bool</span> <span class="identifier">is_valid_password</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">password</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">requirements</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">return</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex_match</span><span class="special">(</span><span class="identifier">password</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex</span><span class="special">(</span><span class="identifier">requirements</span><span class="special">));</span>
+<span class="special">}</span>
+</pre>
+<p>
+            Example: match a UTF-8 encoded filename:
+          </p>
+<pre class="programlisting">
+<span class="comment">//
+</span><span class="comment">// Extract filename part of a path from a UTF-8 encoded std::string and return the result
+</span><span class="comment">// as another std::string:
+</span><span class="comment">//
+</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">get_filename</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">path</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex</span> <span class="identifier">r</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex</span><span class="special">(</span><span class="string">"(?:\\A|.*\\\\)([^\\\\]+)"</span><span class="special">);</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">smatch</span> <span class="identifier">what</span><span class="special">;</span>
+   <span class="keyword">if</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex_match</span><span class="special">(</span><span class="identifier">path</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">r</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="comment">// extract $1 as a std::string:
+</span>      <span class="keyword">return</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">str</span><span class="special">(</span><span class="number">1</span><span class="special">);</span>
+   <span class="special">}</span>
+   <span class="keyword">else</span>
+   <span class="special">{</span>
+      <span class="keyword">throw</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span><span class="special">(</span><span class="string">"Invalid pathname"</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+<a name="boost_regex.ref.non_std_strings.icu.unicode_algo.u32regex_search"></a><h4>
+<a name="id572936"></a>
+            <a href="unicode_algo.html#boost_regex.ref.non_std_strings.icu.unicode_algo.u32regex_search">u32regex_search</a>
+          </h4>
+<p>
+            For each <a href="../../regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>
+            algorithm defined by <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>,
+            then <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">icu</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt> defines an overloaded algorithm that
+            takes the same arguments, but which is called <tt class="computeroutput"><span class="identifier">u32regex_search</span></tt>,
+            and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as
+            an ICU UnicodeString as input.
+          </p>
+<p>
+            Example: search for a character sequence in a specific language block:
+          </p>
+<pre class="programlisting">
+<span class="identifier">UnicodeString</span> <span class="identifier">extract_greek</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">text</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// searches through some UTF-16 encoded text for a block encoded in Greek,
+</span>   <span class="comment">// this expression is imperfect, but the best we can do for now - searching
+</span>   <span class="comment">// for specific scripts is actually pretty hard to do right.
+</span>   <span class="comment">//
+</span>   <span class="comment">// Here we search for a character sequence that begins with a Greek letter,
+</span>   <span class="comment">// and continues with characters that are either not-letters ( [^[:L*:]] )
+</span>   <span class="comment">// or are characters in the Greek character block ( [\\x{370}-\\x{3FF}] ).
+</span>   <span class="comment">//
+</span>   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex</span> <span class="identifier">r</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex</span><span class="special">(</span>
+         <span class="identifier">L</span><span class="string">"[\\x{370}-\\x{3FF}](?:[^[:L*:]]|[\\x{370}-\\x{3FF}])*"</span><span class="special">);</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u16match</span> <span class="identifier">what</span><span class="special">;</span>
+   <span class="keyword">if</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex_search</span><span class="special">(</span><span class="identifier">text</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">r</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="comment">// extract $0 as a UnicodeString:
+</span>      <span class="keyword">return</span> <span class="identifier">UnicodeString</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">length</span><span class="special">(</span><span class="number">0</span><span class="special">));</span>
+   <span class="special">}</span>
+   <span class="keyword">else</span>
+   <span class="special">{</span>
+      <span class="keyword">throw</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span><span class="special">(</span><span class="string">"No Greek found!"</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+<a name="boost_regex.ref.non_std_strings.icu.unicode_algo.u32regex_replace"></a><h4>
+<a name="id573532"></a>
+            <a href="unicode_algo.html#boost_regex.ref.non_std_strings.icu.unicode_algo.u32regex_replace">u32regex_replace</a>
+          </h4>
+<p>
+            For each <a href="../../regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a> algorithm defined
+            by <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>, then <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">icu</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt>
+            defines an overloaded algorithm that takes the same arguments, but which
+            is called <tt class="computeroutput"><span class="identifier">u32regex_replace</span></tt>,
+            and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as
+            an ICU UnicodeString as input. The input sequence and the format string
+            specifier passed to the algorithm, can be encoded independently (for
+            example one can be UTF-8, the other in UTF-16), but the result string
+            / output iterator argument must use the same character encoding as the
+            text being searched.
+          </p>
+<p>
+            Example: Credit card number reformatting:
+          </p>
+<pre class="programlisting">
+<span class="comment">//
+</span><span class="comment">// Take a credit card number as a string of digits, 
+</span><span class="comment">// and reformat it as a human readable string with "-"
+</span><span class="comment">// separating each group of four digit;, 
+</span><span class="comment">// note that we're mixing a UTF-32 regex, with a UTF-16
+</span><span class="comment">// string and a UTF-8 format specifier, and it still all 
+</span><span class="comment">// just works:
+</span><span class="comment">//
+</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex</span> <span class="identifier">e</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex</span><span class="special">(</span>
+      <span class="string">"\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z"</span><span class="special">);</span>
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">human_format</span> <span class="special">=</span> <span class="string">"$1-$2-$3-$4"</span><span class="special">;</span>
+
+<span class="identifier">UnicodeString</span> <span class="identifier">human_readable_card_number</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">return</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex_replace</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">human_format</span><span class="special">);</span>
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="unicode_types.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode_iter.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..f3c9352c
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
@@ -0,0 +1,334 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Unicode Aware Regex Iterators</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../icu.html" title=" Working With
+        Unicode and ICU String Types">
+<link rel="prev" href="unicode_algo.html" title="
+          Unicode Regular Expression Algorithms">
+<link rel="next" href="../mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="unicode_algo.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.icu.unicode_iter"></a><a href="unicode_iter.html" title="
+          Unicode Aware Regex Iterators">
+          Unicode Aware Regex Iterators</a></h5></div></div></div>
+<a name="boost_regex.ref.non_std_strings.icu.unicode_iter.u32regex_iterator"></a><h4>
+<a name="id573998"></a>
+            <a href="unicode_iter.html#boost_regex.ref.non_std_strings.icu.unicode_iter.u32regex_iterator">u32regex_iterator</a>
+          </h4>
+<p>
+            Type <tt class="computeroutput"><span class="identifier">u32regex_iterator</span></tt>
+            is in all respects the same as <a href="../../regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> except that since
+            the regular expression type is always <tt class="computeroutput"><span class="identifier">u32regex</span></tt>
+            it only takes one template parameter (the iterator type). It also calls
+            <tt class="computeroutput"><span class="identifier">u32regex_search</span></tt> internally,
+            allowing it to interface correctly with UTF-8, UTF-16, and UTF-32 data:
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">u32regex_iterator</span>
+<span class="special">{</span>
+   <span class="comment">// for members see regex_iterator
+</span><span class="special">};</span>
+
+<span class="keyword">typedef</span> <span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span>     <span class="identifier">utf8regex_iterator</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span>    <span class="identifier">utf16regex_iterator</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar32</span><span class="special">*&gt;</span>  <span class="identifier">utf32regex_iterator</span><span class="special">;</span>
+</pre>
+<p>
+            In order to simplify the construction of a <tt class="computeroutput"><span class="identifier">u32regex_iterator</span></tt>
+            from a string, there are a series of non-member helper functions called
+            make_u32regex_iterator:
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+                          <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                          <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                          
+<span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+                          <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                          <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                          
+<span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+                          <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                          <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                          
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Alloc</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> 
+   <span class="identifier">make_u32regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                          <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                          <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                          
+<span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                          <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                          <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            Each of these overloads returns an iterator that enumerates all occurrences
+            of expression <span class="emphasis"><em>e</em></span>, in text <span class="emphasis"><em>s</em></span>,
+            using match_flags <span class="emphasis"><em>m</em></span>.
+          </p>
+<p>
+            Example: search for international currency symbols, along with their
+            associated numeric value:
+          </p>
+<pre class="programlisting">
+<span class="keyword">void</span> <span class="identifier">enumerate_currencies</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">text</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// enumerate and print all the currency symbols, along
+</span>   <span class="comment">// with any associated numeric values:
+</span>   <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">re</span> <span class="special">=</span> 
+      <span class="string">"([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"</span>
+      <span class="string">"([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"</span>
+      <span class="string">"(?(1)"</span>
+         <span class="string">"|(?(2)"</span>
+            <span class="string">"[[:Cf:][:Cc:][:Z*:]]*"</span>
+         <span class="string">")"</span>
+         <span class="string">"[[:Sc:]]"</span>
+      <span class="string">")"</span><span class="special">;</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex</span> <span class="identifier">r</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex</span><span class="special">(</span><span class="identifier">re</span><span class="special">);</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex_iterator</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> 
+         <span class="identifier">i</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex_iterator</span><span class="special">(</span><span class="identifier">text</span><span class="special">,</span> <span class="identifier">r</span><span class="special">)),</span> <span class="identifier">j</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">(*</span><span class="identifier">i</span><span class="special">)[</span><span class="number">0</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="special">++</span><span class="identifier">i</span><span class="special">;</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+<p>
+            Calling
+          </p>
+<pre class="programlisting">enumerate_currencies(" $100.23 or £198.12 ");</pre>
+<p>
+            Yields the output:
+          </p>
+<pre class="programlisting">$100.23
+£198.12
+</pre>
+<p>
+            Provided of course that the input is encoded as UTF-8.
+          </p>
+<a name="boost_regex.ref.non_std_strings.icu.unicode_iter.u32regex_token_iterator"></a><h4>
+<a name="id575751"></a>
+            <a href="unicode_iter.html#boost_regex.ref.non_std_strings.icu.unicode_iter.u32regex_token_iterator">u32regex_token_iterator</a>
+          </h4>
+<p>
+            Type <tt class="computeroutput"><span class="identifier">u32regex_token_iterator</span></tt>
+            is in all respects the same as <a href="../../regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> except
+            that since the regular expression type is always <tt class="computeroutput"><span class="identifier">u32regex</span></tt>
+            it only takes one template parameter (the iterator type). It also calls
+            <tt class="computeroutput"><span class="identifier">u32regex_search</span></tt> internally,
+            allowing it to interface correctly with UTF-8, UTF-16, and UTF-32 data:
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">u32regex_token_iterator</span>
+<span class="special">{</span>
+   <span class="comment">// for members see regex_token_iterator
+</span><span class="special">};</span>
+
+<span class="keyword">typedef</span> <span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span>     <span class="identifier">utf8regex_token_iterator</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span>    <span class="identifier">utf16regex_token_iterator</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar32</span><span class="special">*&gt;</span>  <span class="identifier">utf32regex_token_iterator</span><span class="special">;</span>
+</pre>
+<p>
+            In order to simplify the construction of a <tt class="computeroutput"><span class="identifier">u32regex_token_iterator</span></tt>
+            from a string, there are a series of non-member helper functions called
+            <tt class="computeroutput"><span class="identifier">make_u32regex_token_iterator</span></tt>:
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">sub</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                               
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">sub</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">sub</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Alloc</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">sub</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">sub</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            Each of these overloads returns an iterator that enumerates all occurrences
+            of marked sub-expression sub in regular expression <span class="emphasis"><em>e</em></span>,
+            found in text <span class="emphasis"><em>s</em></span>, using match_flags <span class="emphasis"><em>m</em></span>.
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Alloc</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            Each of these overloads returns an iterator that enumerates one sub-expression
+            for each submatch in regular expression <span class="emphasis"><em>e</em></span>, found
+            in text <span class="emphasis"><em>s</em></span>, using match_flags <span class="emphasis"><em>m</em></span>.
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Alloc</span><span class="special">&gt;</span>
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">Traits</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                                
+<span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">u32regex</span><span class="special">&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            Each of these overloads returns an iterator that enumerates one sub-expression
+            for each submatch in regular expression <span class="emphasis"><em>e</em></span>, found
+            in text <span class="emphasis"><em>s</em></span>, using match_flags <span class="emphasis"><em>m</em></span>.
+          </p>
+<p>
+            Example: search for international currency symbols, along with their
+            associated numeric value:
+          </p>
+<pre class="programlisting">
+<span class="keyword">void</span> <span class="identifier">enumerate_currencies2</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">text</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// enumerate and print all the currency symbols, along
+</span>   <span class="comment">// with any associated numeric values:
+</span>   <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">re</span> <span class="special">=</span> 
+      <span class="string">"([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"</span>
+      <span class="string">"([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"</span>
+      <span class="string">"(?(1)"</span>
+         <span class="string">"|(?(2)"</span>
+            <span class="string">"[[:Cf:][:Cc:][:Z*:]]*"</span>
+         <span class="string">")"</span>
+         <span class="string">"[[:Sc:]]"</span>
+      <span class="string">")"</span><span class="special">;</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex</span> <span class="identifier">r</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex</span><span class="special">(</span><span class="identifier">re</span><span class="special">);</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">u32regex_token_iterator</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> 
+      <span class="identifier">i</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_u32regex_token_iterator</span><span class="special">(</span><span class="identifier">text</span><span class="special">,</span> <span class="identifier">r</span><span class="special">,</span> <span class="number">1</span><span class="special">)),</span> <span class="identifier">j</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">i</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="special">++</span><span class="identifier">i</span><span class="special">;</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="unicode_algo.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..6f42cbf9
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
@@ -0,0 +1,144 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Unicode regular expression types</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../icu.html" title=" Working With
+        Unicode and ICU String Types">
+<link rel="prev" href="intro.html" title=" Introduction
+          to using Regex with ICU">
+<link rel="next" href="unicode_algo.html" title="
+          Unicode Regular Expression Algorithms">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="intro.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode_algo.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.icu.unicode_types"></a><a href="unicode_types.html" title="
+          Unicode regular expression types">
+          Unicode regular expression types</a></h5></div></div></div>
+<p>
+            Header <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">icu</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt> provides a regular expression traits
+            class that handles UTF-32 characters:
+          </p>
+<pre class="programlisting">
+<span class="keyword">class</span> <span class="identifier">icu_regex_traits</span><span class="special">;</span>
+</pre>
+<p>
+            and a regular expression type based upon that:
+          </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">UChar32</span><span class="special">,</span><span class="identifier">icu_regex_traits</span><span class="special">&gt;</span> <span class="identifier">u32regex</span><span class="special">;</span>
+</pre>
+<p>
+            The type <tt class="computeroutput"><span class="identifier">u32regex</span></tt> is
+            regular expression type to use for all Unicode regular expressions; internally
+            it uses UTF-32 code points, but can be created from, and used to search,
+            either UTF-8, or UTF-16 encoded strings as well as UTF-32 ones.
+          </p>
+<p>
+            The constructors, and assign member functions of <tt class="computeroutput"><span class="identifier">u32regex</span></tt>,
+            require UTF-32 encoded strings, but there are a series of overloaded
+            algorithms called <tt class="computeroutput"><span class="identifier">make_u32regex</span></tt>
+            which allow regular expressions to be created from UTF-8, UTF-16, or
+            UTF-32 encoded strings:
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">InputIterator</span><span class="special">&gt;</span> 
+<span class="identifier">u32regex</span> <span class="identifier">make_u32regex</span><span class="special">(</span><span class="identifier">InputIterator</span> <span class="identifier">i</span><span class="special">,</span> 
+                       <span class="identifier">InputIterator</span> <span class="identifier">j</span><span class="special">,</span> 
+                       <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">opt</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: Creates a regular expression
+            object from the iterator sequence [i,j). The character encoding of the
+            sequence is determined based upon sizeof(*i): 1 implies UTF-8, 2 implies
+            UTF-16, and 4 implies UTF-32.
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex</span> <span class="identifier">make_u32regex</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+                       <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">opt</span> 
+                           <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: Creates a regular expression
+            object from the Null-terminated UTF-8 characater sequence <span class="emphasis"><em>p</em></span>.
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex</span> <span class="identifier">make_u32regex</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">unsigned</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+                       <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">opt</span> 
+                           <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: Creates a regular expression
+            object from the Null-terminated UTF-8 characater sequence p.
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex</span> <span class="identifier">make_u32regex</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+                       <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">opt</span> 
+                           <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: Creates a regular expression
+            object from the Null-terminated characater sequence p. The character
+            encoding of the sequence is determined based upon sizeof(wchar_t): 1
+            implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex</span> <span class="identifier">make_u32regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">UChar</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+                       <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">opt</span> 
+                           <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: Creates a regular expression
+            object from the Null-terminated UTF-16 characater sequence p.
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">C</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">A</span><span class="special">&gt;</span>
+<span class="identifier">u32regex</span> <span class="identifier">make_u32regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">C</span><span class="special">,</span> <span class="identifier">T</span><span class="special">,</span> <span class="identifier">A</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                       <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">opt</span> 
+                           <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: Creates a regular expression
+            object from the string s. The character encoding of the string is determined
+            based upon sizeof(C): 1 implies UTF-8, 2 implies UTF-16, and 4 implies
+            UTF-32.
+          </p>
+<pre class="programlisting">
+<span class="identifier">u32regex</span> <span class="identifier">make_u32regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">UnicodeString</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                       <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">opt</span> 
+                           <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">perl</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: Creates a regular expression
+            object from the UTF-16 encoding string s.
+          </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="intro.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../icu.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unicode_algo.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..f17f4620
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Using
+        Boost Regex With MFC Strings</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../non_std_strings.html" title=" Interfacing With Non-Standard
+      String Types">
+<link rel="prev" href="icu/unicode_iter.html" title="
+          Unicode Aware Regex Iterators">
+<link rel="next" href="mfc_strings/mfc_intro.html" title="
+          Introduction to Boost.Regex and MFC Strings">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="icu/unicode_iter.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../non_std_strings.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_strings/mfc_intro.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.non_std_strings.mfc_strings"></a><a href="mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings"> Using
+        Boost Regex With MFC Strings</a></h4></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="mfc_strings/mfc_intro.html">
+          Introduction to Boost.Regex and MFC Strings</a></span></dt>
+<dt><span class="section"><a href="mfc_strings/mfc_regex_types.html">
+          Regex Types Used With MFC Strings</a></span></dt>
+<dt><span class="section"><a href="mfc_strings/mfc_regex_create.html">
+          Regular Expression Creation From an MFC String</a></span></dt>
+<dt><span class="section"><a href="mfc_strings/mfc_algo.html">
+          Overloaded Algorithms For MFC String Types</a></span></dt>
+<dt><span class="section"><a href="mfc_strings/mfc_iter.html">
+          Iterating Over the Matches Within An MFC String</a></span></dt>
+</dl></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="icu/unicode_iter.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../non_std_strings.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_strings/mfc_intro.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..0d05bf1c
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
@@ -0,0 +1,241 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Overloaded Algorithms For MFC String Types</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings">
+<link rel="prev" href="mfc_regex_create.html" title="
+          Regular Expression Creation From an MFC String">
+<link rel="next" href="mfc_iter.html" title="
+          Iterating Over the Matches Within An MFC String">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_regex_create.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_iter.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_algo"></a><a href="mfc_algo.html" title="
+          Overloaded Algorithms For MFC String Types">
+          Overloaded Algorithms For MFC String Types</a></h5></div></div></div>
+<p>
+            For each regular expression algorithm that's overloaded for a <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span></tt> argument, there is also
+            one overloaded for the MFC/ATL string types. These algorithm signatures
+            all look a lot more complex than they actually are, but for completeness
+            here they are anyway:
+          </p>
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_match"></a><h4>
+<a name="id580927"></a>
+            <a href="mfc_algo.html#boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_match">regex_match</a>
+          </h4>
+<p>
+            There are two overloads, the first reports what matched in a match_results
+            structure, the second does not.
+          </p>
+<p>
+            All the usual caveats for <a href="../../regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a> apply, in particular
+            the algorithm will only report a successful match if all of the input
+            text matches the expression, if this isn't what you want then use <a href="../../regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>
+            instead.
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">A</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span>
+   <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+   <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">B</span><span class="special">*,</span> <span class="identifier">A</span><span class="special">&gt;&amp;</span> <span class="identifier">what</span><span class="special">,</span> 
+   <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span> 
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span>
+            <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span>
+            <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+<p>
+            <span class="bold"><b>Example:</b></span>
+          </p>
+<pre class="programlisting">
+<span class="comment">//
+</span><span class="comment">// Extract filename part of a path from a CString and return the result
+</span><span class="comment">// as another CString:
+</span><span class="comment">//
+</span><span class="identifier">CString</span> <span class="identifier">get_filename</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">CString</span><span class="special">&amp;</span> <span class="identifier">path</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tregex</span> <span class="identifier">r</span><span class="special">(</span><span class="identifier">__T</span><span class="special">(</span><span class="string">"(?:\\A|.*\\\\)([^\\\\]+)"</span><span class="special">));</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tmatch</span> <span class="identifier">what</span><span class="special">;</span>
+   <span class="keyword">if</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">path</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">r</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="comment">// extract $1 as a CString:
+</span>      <span class="keyword">return</span> <span class="identifier">CString</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">1</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">length</span><span class="special">(</span><span class="number">1</span><span class="special">));</span>
+   <span class="special">}</span>
+   <span class="keyword">else</span>
+   <span class="special">{</span>
+      <span class="keyword">throw</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span><span class="special">(</span><span class="string">"Invalid pathname"</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_match__second_overload_"></a><h4>
+<a name="id581844"></a>
+            <a href="mfc_algo.html#boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_match__second_overload_">regex_match
+            (second overload)</a>
+          </h4>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">T</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span>
+   <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+   <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">B</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">)</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span>
+            <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span>
+            <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+<p>
+            <span class="bold"><b>Example:</b></span>
+          </p>
+<pre class="programlisting">
+<span class="comment">//
+</span><span class="comment">// Find out if *password* meets our password requirements,
+</span><span class="comment">// as defined by the regular expression *requirements*.
+</span><span class="comment">//
+</span><span class="keyword">bool</span> <span class="identifier">is_valid_password</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">CString</span><span class="special">&amp;</span> <span class="identifier">password</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">CString</span><span class="special">&amp;</span> <span class="identifier">requirements</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">return</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">password</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_regex</span><span class="special">(</span><span class="identifier">requirements</span><span class="special">));</span>
+<span class="special">}</span>      
+</pre>
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_search"></a><h4>
+<a name="id582440"></a>
+            <a href="mfc_algo.html#boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_search">regex_search</a>
+          </h4>
+<p>
+            There are two additional overloads for <a href="../../regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>, the first reports
+            what matched the second does not:
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">A</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">T</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                  <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">A</span><span class="special">&gt;&amp;</span> <span class="identifier">what</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">)</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns ::boost::regex_search(s.GetString(),
+            s.GetString() + s.GetLength(), what, e, f);
+          </p>
+<p>
+            <span class="bold"><b>Example</b></span>: Postcode extraction from an
+            address string.
+          </p>
+<pre class="programlisting">
+<span class="identifier">CString</span> <span class="identifier">extract_postcode</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">CString</span><span class="special">&amp;</span> <span class="identifier">address</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// searches throw address for a UK postcode and returns the result,
+</span>   <span class="comment">// the expression used is by Phil A. on www.regxlib.com:
+</span>   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tregex</span> <span class="identifier">r</span><span class="special">(</span><span class="identifier">__T</span><span class="special">(</span><span class="string">"^(([A-Z]{1,2}[0-9]{1,2})|([A-Z]{1,2}[0-9][A-Z]))\\s?([0-9][A-Z]{2})$"</span><span class="special">));</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tmatch</span> <span class="identifier">what</span><span class="special">;</span>
+   <span class="keyword">if</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">address</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">r</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="comment">// extract $0 as a CString:
+</span>      <span class="keyword">return</span> <span class="identifier">CString</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">length</span><span class="special">());</span>
+   <span class="special">}</span>
+   <span class="keyword">else</span>
+   <span class="special">{</span>
+      <span class="keyword">throw</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span><span class="special">(</span><span class="string">"No postcode found"</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>      
+</pre>
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_search__second_overload_"></a><h4>
+<a name="id583183"></a>
+            <a href="mfc_algo.html#boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_search__second_overload_">regex_search
+            (second overload)</a>
+          </h4>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">T</span><span class="special">&gt;</span>
+<span class="keyword">inline</span> <span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+               <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">)</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span>
+            <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span>
+            <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_replace"></a><h4>
+<a name="id583590"></a>
+            <a href="mfc_algo.html#boost_regex.ref.non_std_strings.mfc_strings.mfc_algo.regex_replace">regex_replace</a>
+          </h4>
+<p>
+            There are two additional overloads for <a href="../../regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a>, the first sends
+            output to an output iterator, while the second creates a new string
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span>
+         <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">OutputIterator</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span>
+                           <span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span>
+                           <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                           <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">)</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">out</span><span class="special">,</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">fmt</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span>
+            <span class="identifier">flags</span><span class="special">);</span></tt>
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                           <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                           <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">)</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns a new string created
+            using <a href="../../regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a>,
+            and the same memory manager as string <span class="emphasis"><em>s</em></span>.
+          </p>
+<p>
+            <span class="bold"><b>Example</b></span>:
+          </p>
+<pre class="programlisting">
+<span class="comment">//
+</span><span class="comment">// Take a credit card number as a string of digits, 
+</span><span class="comment">// and reformat it as a human readable string with "-"
+</span><span class="comment">// separating each group of four digits:
+</span><span class="comment">//
+</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tregex</span> <span class="identifier">e</span><span class="special">(</span><span class="identifier">__T</span><span class="special">(</span><span class="string">"\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z"</span><span class="special">));</span>
+<span class="keyword">const</span> <span class="identifier">CString</span> <span class="identifier">human_format</span> <span class="special">=</span> <span class="identifier">__T</span><span class="special">(</span><span class="string">"$1-$2-$3-$4"</span><span class="special">);</span>
+
+<span class="identifier">CString</span> <span class="identifier">human_readable_card_number</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">CString</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">return</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">human_format</span><span class="special">);</span>
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_regex_create.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_iter.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..017ca050
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
@@ -0,0 +1,69 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Introduction to Boost.Regex and MFC Strings</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings">
+<link rel="prev" href="../mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings">
+<link rel="next" href="mfc_regex_types.html" title="
+          Regex Types Used With MFC Strings">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_regex_types.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_intro"></a><a href="mfc_intro.html" title="
+          Introduction to Boost.Regex and MFC Strings">
+          Introduction to Boost.Regex and MFC Strings</a></h5></div></div></div>
+<p>
+            The header <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">/</span><span class="identifier">mfc</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></tt> provides Boost.Regex support for
+            MFC string types: note that this support requires Visual Studio .NET
+            (Visual C++ 7) or later, where all of the MFC and ATL string types are
+            based around the CSimpleStringT class template.
+          </p>
+<p>
+            In the following documentation, whenever you see CSimpleStringT&lt;charT&gt;,
+            then you can substitute any of the following MFC/ATL types (all of which
+            inherit from CSimpleStringT):
+          </p>
+<pre class="programlisting">
+<span class="identifier">CString</span>
+<span class="identifier">CStringA</span>
+<span class="identifier">CStringW</span>
+<span class="identifier">CAtlString</span>
+<span class="identifier">CAtlStringA</span>
+<span class="identifier">CAtlStringW</span>
+<span class="identifier">CStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span><span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="identifier">CFixedStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span><span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_regex_types.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..beabcfcf
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
@@ -0,0 +1,158 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Iterating Over the Matches Within An MFC String</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings">
+<link rel="prev" href="mfc_algo.html" title="
+          Overloaded Algorithms For MFC String Types">
+<link rel="next" href="../../posix.html" title=" POSIX Compatible C API's">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_algo.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../posix.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_iter"></a><a href="mfc_iter.html" title="
+          Iterating Over the Matches Within An MFC String">
+          Iterating Over the Matches Within An MFC String</a></h5></div></div></div>
+<p>
+            The following helper functions are provided to ease the conversion from
+            an MFC/ATL string to a <a href="../../regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> or <a href="../../regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a>:
+          </p>
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_iter.regex_iterator_creation_helper"></a><h4>
+<a name="id584678"></a>
+            <a href="mfc_iter.html#boost_regex.ref.non_std_strings.mfc_strings.mfc_iter.regex_iterator_creation_helper">regex_iterator
+            creation helper</a>
+          </h4>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="identifier">charT</span> <span class="keyword">const</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_regex_iterator</span><span class="special">(</span>
+      <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+      <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+      <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">regex_iterator</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span> <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span>
+            <span class="identifier">e</span><span class="special">,</span>
+            <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+<p>
+            <span class="bold"><b>Example</b></span>:
+          </p>
+<pre class="programlisting">
+<span class="keyword">void</span> <span class="identifier">enumerate_links</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">CString</span><span class="special">&amp;</span> <span class="identifier">html</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// enumerate and print all the  links in some HTML text,
+</span>   <span class="comment">// the expression used is by Andew Lee on www.regxlib.com:
+</span>   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tregex</span> <span class="identifier">r</span><span class="special">(</span>
+      <span class="identifier">__T</span><span class="special">(</span><span class="string">"href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+"</span>
+          <span class="string">"(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*"</span>
+          <span class="string">"(\\/|\\?\\w*=\\w*(&amp;\\w*=\\w*)*)?)[\"\']"</span><span class="special">));</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tregex_iterator</span> <span class="identifier">i</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_regex_iterator</span><span class="special">(</span><span class="identifier">html</span><span class="special">,</span> <span class="identifier">r</span><span class="special">)),</span> <span class="identifier">j</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">(*</span><span class="identifier">i</span><span class="special">)[</span><span class="number">1</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="special">++</span><span class="identifier">i</span><span class="special">;</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_iter.regex_token_iterator_creation_helpers"></a><h4>
+<a name="id585433"></a>
+            <a href="mfc_iter.html#boost_regex.ref.non_std_strings.mfc_strings.mfc_iter.regex_token_iterator_creation_helpers">regex_token_iterator
+            creation helpers</a>
+          </h4>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span> 
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="identifier">charT</span> <span class="keyword">const</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+      <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+      <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+      <span class="keyword">int</span> <span class="identifier">sub</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+      <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">regex_token_iterator</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span> <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span>
+            <span class="identifier">e</span><span class="special">,</span>
+            <span class="identifier">sub</span><span class="special">,</span>
+            <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span> 
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="identifier">charT</span> <span class="keyword">const</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+      <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+      <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+      <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">subs</span><span class="special">,</span> 
+      <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">regex_token_iterator</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span> <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span>
+            <span class="identifier">e</span><span class="special">,</span>
+            <span class="identifier">subs</span><span class="special">,</span>
+            <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span> 
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="identifier">charT</span> <span class="keyword">const</span><span class="special">*&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+      <span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+      <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+      <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span> <span class="identifier">subs</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+      <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">regex_token_iterator</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span> <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span>
+            <span class="identifier">e</span><span class="special">,</span>
+            <span class="identifier">subs</span><span class="special">,</span>
+            <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+<p>
+            <span class="bold"><b>Example</b></span>:
+          </p>
+<pre class="programlisting">
+<span class="keyword">void</span> <span class="identifier">enumerate_links2</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">CString</span><span class="special">&amp;</span> <span class="identifier">html</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// enumerate and print all the  links in some HTML text,
+</span>   <span class="comment">// the expression used is by Andew Lee on www.regxlib.com:
+</span>   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tregex</span> <span class="identifier">r</span><span class="special">(</span>
+         <span class="identifier">__T</span><span class="special">(</span><span class="string">"href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+"</span>
+             <span class="string">"(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*"</span>
+             <span class="string">"(\\/|\\?\\w*=\\w*(&amp;\\w*=\\w*)*)?)[\"\']"</span><span class="special">));</span>
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">tregex_token_iterator</span> <span class="identifier">i</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">make_regex_token_iterator</span><span class="special">(</span><span class="identifier">html</span><span class="special">,</span> <span class="identifier">r</span><span class="special">,</span> <span class="number">1</span><span class="special">)),</span> <span class="identifier">j</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">i</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="special">++</span><span class="identifier">i</span><span class="special">;</span>
+   <span class="special">}</span>
+<span class="special">}</span>      
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_algo.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../posix.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..5c4f3b44
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
@@ -0,0 +1,61 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Regular Expression Creation From an MFC String</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings">
+<link rel="prev" href="mfc_regex_types.html" title="
+          Regex Types Used With MFC Strings">
+<link rel="next" href="mfc_algo.html" title="
+          Overloaded Algorithms For MFC String Types">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_regex_types.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_algo.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_regex_create"></a><a href="mfc_regex_create.html" title="
+          Regular Expression Creation From an MFC String">
+          Regular Expression Creation From an MFC String</a></h5></div></div></div>
+<p>
+            The following helper function is available to assist in the creation
+            of a regular expression from an MFC/ATL string type:
+          </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> 
+   <span class="identifier">make_regex</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">ATL</span><span class="special">::</span><span class="identifier">CSimpleStringT</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+            <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">syntax_option_type</span> <span class="identifier">f</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">normal</span><span class="special">);</span>
+</pre>
+<p>
+            <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetString</span><span class="special">()</span> <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">GetLength</span><span class="special">(),</span>
+            <span class="identifier">f</span><span class="special">);</span></tt>
+          </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_regex_types.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_algo.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..452240b8
--- /dev/null
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
@@ -0,0 +1,62 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+          Regex Types Used With MFC Strings</title>
+<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../../index.html" title="Boost.Regex">
+<link rel="up" href="../mfc_strings.html" title=" Using
+        Boost Regex With MFC Strings">
+<link rel="prev" href="mfc_intro.html" title="
+          Introduction to Boost.Regex and MFC Strings">
+<link rel="next" href="mfc_regex_create.html" title="
+          Regular Expression Creation From an MFC String">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_intro.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_regex_create.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_regex.ref.non_std_strings.mfc_strings.mfc_regex_types"></a><a href="mfc_regex_types.html" title="
+          Regex Types Used With MFC Strings">
+          Regex Types Used With MFC Strings</a></h5></div></div></div>
+<p>
+            The following typedefs are provided for the convenience of those working
+            with TCHAR's:
+          </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">TCHAR</span><span class="special">&gt;</span>                  <span class="identifier">tregex</span><span class="special">;</span> 
+<span class="keyword">typedef</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">TCHAR</span> <span class="keyword">const</span><span class="special">*&gt;</span>         <span class="identifier">tmatch</span><span class="special">;</span> 
+<span class="keyword">typedef</span> <span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="identifier">TCHAR</span> <span class="keyword">const</span><span class="special">*&gt;</span>        <span class="identifier">tregex_iterator</span><span class="special">;</span> 
+<span class="keyword">typedef</span> <span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="identifier">TCHAR</span> <span class="keyword">const</span><span class="special">*&gt;</span>  <span class="identifier">tregex_token_iterator</span><span class="special">;</span> 
+</pre>
+<p>
+            If you are working with explicitly narrow or wide characters rather than
+            TCHAR, then use the regular Boost.Regex types <tt class="computeroutput"><span class="identifier">regex</span></tt>
+            and <tt class="computeroutput"><span class="identifier">wregex</span></tt> instead.
+          </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="mfc_intro.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mfc_strings.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mfc_regex_create.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/posix.html b/doc/html/boost_regex/ref/posix.html
new file mode 100644
index 00000000..18acf970
--- /dev/null
+++ b/doc/html/boost_regex/ref/posix.html
@@ -0,0 +1,563 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> POSIX Compatible C API's</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="non_std_strings/mfc_strings/mfc_iter.html" title="
+          Iterating Over the Matches Within An MFC String">
+<link rel="next" href="concepts.html" title=" Concepts">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="non_std_strings/mfc_strings/mfc_iter.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.posix"></a><a href="posix.html" title=" POSIX Compatible C API's"> POSIX Compatible C API's</a></h3></div></div></div>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          this is an abridged reference to the POSIX API functions, these are provided
+          for compatibility with other libraries, rather than as an API to be used
+          in new code (unless you need access from a language other than C++). This
+          version of these functions should also happily coexist with other versions,
+          as the names used are macros that expand to the actual function names.
+        </p></td></tr>
+</table></div>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">cregex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+        or:
+      </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
+</pre>
+<p>
+        The following functions are available for users who need a POSIX compatible
+        C library, they are available in both Unicode and narrow character versions,
+        the standard POSIX API names are macros that expand to one version or the
+        other depending upon whether UNICODE is defined or not.
+      </p>
+<div class="important"><table border="0" summary="Important">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../doc/html/images/important.png"></td>
+<th align="left">Important</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          Note that all the symbols defined here are enclosed inside namespace <tt class="computeroutput"><span class="identifier">boost</span></tt> when used in C++ programs, unless
+          you use <tt class="computeroutput"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></tt>
+          instead - in which case the symbols are still defined in namespace boost,
+          but are made available in the global namespace as well.
+        </p></td></tr>
+</table></div>
+<p>
+        The functions are defined as:
+      </p>
+<pre class="programlisting">
+<span class="keyword">extern</span> <span class="string">"C"</span> <span class="special">{</span>
+
+<span class="keyword">struct</span> <span class="identifier">regex_tA</span><span class="special">;</span>
+<span class="keyword">struct</span> <span class="identifier">regex_tW</span><span class="special">;</span>
+
+<span class="keyword">int</span> <span class="identifier">regcompA</span><span class="special">(</span><span class="identifier">regex_tA</span><span class="special">*,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*,</span> <span class="keyword">int</span><span class="special">);</span>
+<span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">regerrorA</span><span class="special">(</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">regex_tA</span><span class="special">*,</span> <span class="keyword">char</span><span class="special">*,</span> <span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">);</span>
+<span class="keyword">int</span> <span class="identifier">regexecA</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_tA</span><span class="special">*,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*,</span> <span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">regmatch_t</span><span class="special">*,</span> <span class="keyword">int</span><span class="special">);</span>
+<span class="keyword">void</span> <span class="identifier">regfreeA</span><span class="special">(</span><span class="identifier">regex_tA</span><span class="special">*);</span>
+
+<span class="keyword">int</span> <span class="identifier">regcompW</span><span class="special">(</span><span class="identifier">regex_tW</span><span class="special">*,</span> <span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*,</span> <span class="keyword">int</span><span class="special">);</span>
+<span class="keyword">unsigned</span> <span class="keyword">int</span> <span class="identifier">regerrorW</span><span class="special">(</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">regex_tW</span><span class="special">*,</span> <span class="keyword">wchar_t</span><span class="special">*,</span> <span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">);</span>
+<span class="keyword">int</span> <span class="identifier">regexecW</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_tW</span><span class="special">*,</span> <span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*,</span> <span class="keyword">unsigned</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">regmatch_t</span><span class="special">*,</span> <span class="keyword">int</span><span class="special">);</span>
+<span class="keyword">void</span> <span class="identifier">regfreeW</span><span class="special">(</span><span class="identifier">regex_tW</span><span class="special">*);</span>
+
+<span class="preprocessor">#ifdef</span> <span class="identifier">UNICODE</span>
+<span class="preprocessor">#define</span> <span class="identifier">regcomp</span> <span class="identifier">regcompW</span>
+<span class="preprocessor">#define</span> <span class="identifier">regerror</span> <span class="identifier">regerrorW</span>
+<span class="preprocessor">#define</span> <span class="identifier">regexec</span> <span class="identifier">regexecW</span>
+<span class="preprocessor">#define</span> <span class="identifier">regfree</span> <span class="identifier">regfreeW</span>
+<span class="preprocessor">#define</span> <span class="identifier">regex_t</span> <span class="identifier">regex_tW</span>
+<span class="preprocessor">#else</span>
+<span class="preprocessor">#define</span> <span class="identifier">regcomp</span> <span class="identifier">regcompA</span>
+<span class="preprocessor">#define</span> <span class="identifier">regerror</span> <span class="identifier">regerrorA</span>
+<span class="preprocessor">#define</span> <span class="identifier">regexec</span> <span class="identifier">regexecA</span>
+<span class="preprocessor">#define</span> <span class="identifier">regfree</span> <span class="identifier">regfreeA</span>
+<span class="preprocessor">#define</span> <span class="identifier">regex_t</span> <span class="identifier">regex_tA</span>
+<span class="preprocessor">#endif</span>
+<span class="special">}</span>
+</pre>
+<p>
+        All the functions operate on structure regex_t, which exposes two public
+        members:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Member
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="keyword">unsigned</span> <span class="keyword">int</span>
+                <span class="identifier">re_nsub</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                This is filled in by <tt class="computeroutput"><span class="identifier">regcomp</span></tt>
+                and indicates the number of sub-expressions contained in the regular
+                expression.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">TCHAR</span><span class="special">*</span> <span class="identifier">re_endp</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Points to the end of the expression to compile when the flag REG_PEND
+                is set.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          <tt class="computeroutput"><span class="identifier">regex_t</span></tt> is actually a
+          <tt class="computeroutput"><span class="preprocessor">#define</span></tt> - it is either
+          <tt class="computeroutput"><span class="identifier">regex_tA</span></tt> or <tt class="computeroutput"><span class="identifier">regex_tW</span></tt> depending upon whether <tt class="computeroutput"><span class="identifier">UNICODE</span></tt> is defined or not, <tt class="computeroutput"><span class="identifier">TCHAR</span></tt> is either <tt class="computeroutput"><span class="keyword">char</span></tt>
+          or <tt class="computeroutput"><span class="keyword">wchar_t</span></tt> again depending
+          upon the macro <tt class="computeroutput"><span class="identifier">UNICODE</span></tt>.
+        </p></td></tr>
+</table></div>
+<a name="regcomp"></a><p>
+      </p>
+<a name="boost_regex.ref.posix.regcomp"></a><h4>
+<a name="id588362"></a>
+        <a href="posix.html#boost_regex.ref.posix.regcomp">regcomp</a>
+      </h4>
+<p>
+        <tt class="computeroutput"><span class="identifier">regcomp</span></tt> takes a pointer to
+        a <tt class="computeroutput"><span class="identifier">regex_t</span></tt>, a pointer to the
+        expression to compile and a flags parameter which can be a combination of:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Flag
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                REG_EXTENDED
+              </p>
+              </td>
+<td>
+              <p>
+                Compiles modern regular expressions. Equivalent to <tt class="computeroutput"><span class="identifier">regbase</span><span class="special">::</span><span class="identifier">char_classes</span> <span class="special">|</span>
+                <span class="identifier">regbase</span><span class="special">::</span><span class="identifier">intervals</span> <span class="special">|</span>
+                <span class="identifier">regbase</span><span class="special">::</span><span class="identifier">bk_refs</span></tt>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_BASIC
+              </p>
+              </td>
+<td>
+              <p>
+                Compiles basic (obsolete) regular expression syntax. Equivalent to
+                <tt class="computeroutput"><span class="identifier">regbase</span><span class="special">::</span><span class="identifier">char_classes</span> <span class="special">|</span>
+                <span class="identifier">regbase</span><span class="special">::</span><span class="identifier">intervals</span> <span class="special">|</span>
+                <span class="identifier">regbase</span><span class="special">::</span><span class="identifier">limited_ops</span> <span class="special">|</span>
+                <span class="identifier">regbase</span><span class="special">::</span><span class="identifier">bk_braces</span> <span class="special">|</span>
+                <span class="identifier">regbase</span><span class="special">::</span><span class="identifier">bk_parens</span> <span class="special">|</span>
+                <span class="identifier">regbase</span><span class="special">::</span><span class="identifier">bk_refs</span></tt>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_NOSPEC
+              </p>
+              </td>
+<td>
+              <p>
+                All characters are ordinary, the expression is a literal string.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_ICASE
+              </p>
+              </td>
+<td>
+              <p>
+                Compiles for matching that ignores character case.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_NOSUB
+              </p>
+              </td>
+<td>
+              <p>
+                Has no effect in this library.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_NEWLINE
+              </p>
+              </td>
+<td>
+              <p>
+                When this flag is set a dot does not match the newline character.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_PEND
+              </p>
+              </td>
+<td>
+              <p>
+                When this flag is set the re_endp parameter of the regex_t structure
+                must point to the end of the regular expression to compile.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_NOCOLLATE
+              </p>
+              </td>
+<td>
+              <p>
+                When this flag is set then locale dependent collation for character
+                ranges is turned off.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_ESCAPE_IN_LISTS
+              </p>
+              </td>
+<td>
+              <p>
+                When this flag is set, then escape sequences are permitted in bracket
+                expressions (character sets).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_NEWLINE_ALT
+              </p>
+              </td>
+<td>
+              <p>
+                When this flag is set then the newline character is equivalent to
+                the alternation operator |.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_PERL
+              </p>
+              </td>
+<td>
+              <p>
+                Compiles Perl like regular expressions.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_AWK
+              </p>
+              </td>
+<td>
+              <p>
+                A shortcut for awk-like behavior: <tt class="computeroutput"><span class="identifier">REG_EXTENDED</span>
+                <span class="special">|</span> <span class="identifier">REG_ESCAPE_IN_LISTS</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_GREP
+              </p>
+              </td>
+<td>
+              <p>
+                A shortcut for grep like behavior: <tt class="computeroutput"><span class="identifier">REG_BASIC</span>
+                <span class="special">|</span> <span class="identifier">REG_NEWLINE_ALT</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_EGREP
+              </p>
+              </td>
+<td>
+              <p>
+                A shortcut for egrep like behavior: <tt class="computeroutput"><span class="identifier">REG_EXTENDED</span>
+                <span class="special">|</span> <span class="identifier">REG_NEWLINE_ALT</span></tt>
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="regerror"></a><p>
+      </p>
+<a name="boost_regex.ref.posix.regerror"></a><h4>
+<a name="id589006"></a>
+        <a href="posix.html#boost_regex.ref.posix.regerror">regerror</a>
+      </h4>
+<p>
+        regerror takes the following parameters, it maps an error code to a human
+        readable string:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Parameter
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                int code
+              </p>
+              </td>
+<td>
+              <p>
+                The error code.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                const regex_t* e
+              </p>
+              </td>
+<td>
+              <p>
+                The regular expression (can be null).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                char* buf
+              </p>
+              </td>
+<td>
+              <p>
+                The buffer to fill in with the error message.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                unsigned int buf_size
+              </p>
+              </td>
+<td>
+              <p>
+                The length of buf.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        If the error code is OR'ed with REG_ITOA then the message that results is
+        the printable name of the code rather than a message, for example "REG_BADPAT".
+        If the code is REG_ATIO then e must not be null and e-&gt;re_pend must point
+        to the printable name of an error code, the return value is then the value
+        of the error code. For any other value of code, the return value is the number
+        of characters in the error message, if the return value is greater than or
+        equal to buf_size then regerror will have to be called again with a larger
+        buffer.
+      </p>
+<a name="regexec"></a><p>
+      </p>
+<a name="boost_regex.ref.posix.regexec"></a><h4>
+<a name="id589189"></a>
+        <a href="posix.html#boost_regex.ref.posix.regexec">regexec</a>
+      </h4>
+<p>
+        regexec finds the first occurrence of expression e within string buf. If
+        len is non-zero then <span class="emphasis"><em>*m</em></span> is filled in with what matched
+        the regular expression, m[0] contains what matched the whole string, m[1]
+        the first sub-expression etc, see regmatch_t in the header file declaration
+        for more details. The eflags parameter can be a combination of:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Flag
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                REG_NOTBOL
+              </p>
+              </td>
+<td>
+              <p>
+                Parameter buf does not represent the start of a line.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_NOTEOL
+              </p>
+              </td>
+<td>
+              <p>
+                Parameter buf does not terminate at the end of a line.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                REG_STARTEND
+              </p>
+              </td>
+<td>
+              <p>
+                The string searched starts at buf + pmatch[0].rm_so and ends at buf
+                + pmatch[0].rm_eo.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="regfree"></a><p>
+      </p>
+<a name="boost_regex.ref.posix.regfree"></a><h4>
+<a name="id589331"></a>
+        <a href="posix.html#boost_regex.ref.posix.regfree">regfree</a>
+      </h4>
+<p>
+        <tt class="computeroutput"><span class="identifier">regfree</span></tt> frees all the memory
+        that was allocated by regcomp.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="non_std_strings/mfc_strings/mfc_iter.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/regex_iterator.html b/doc/html/boost_regex/ref/regex_iterator.html
new file mode 100644
index 00000000..0939d550
--- /dev/null
+++ b/doc/html/boost_regex/ref/regex_iterator.html
@@ -0,0 +1,562 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> regex_iterator</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="regex_replace.html" title=" regex_replace">
+<link rel="next" href="regex_token_iterator.html" title=" regex_token_iterator">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_replace.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_token_iterator.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.regex_iterator"></a><a href="regex_iterator.html" title=" regex_iterator"> regex_iterator</a></h3></div></div></div>
+<p>
+        The iterator type <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> will enumerate all
+        of the regular expression matches found in some sequence: dereferencing a
+        <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>
+        yields a reference to a <a href="match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> object.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> 
+         <span class="keyword">class</span> <span class="identifier">charT</span> <span class="special">=</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span>
+         <span class="keyword">class</span> <span class="identifier">traits</span> <span class="special">=</span> <span class="identifier">regex_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">regex_iterator</span> 
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+   <span class="keyword">typedef</span>          <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span>                              <span class="identifier">regex_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>                    <span class="identifier">value_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">difference_type</span> <span class="identifier">difference_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span>                                       <span class="identifier">pointer</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">&amp;</span>                                       <span class="identifier">reference</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">std</span><span class="special">::</span><span class="identifier">forward_iterator_tag</span>                               <span class="identifier">iterator_category</span><span class="special">;</span>
+   
+   <a href="regex_iterator.html#boost_regex.regex_iterator.construct1">regex_iterator</a><span class="special">();</span>
+   <a href="regex_iterator.html#boost_regex.regex_iterator.construct2">regex_iterator</a><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+                  <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+   <a href="regex_iterator.html#boost_regex.regex_iterator.construct3">regex_iterator</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;);</span>
+   <span class="identifier">regex_iterator</span><span class="special">&amp;</span> <a href="regex_iterator.html#boost_regex.regex_iterator.assign">operator=(</a><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;);</span>
+   <span class="keyword">bool</span> <a href="regex_iterator.html#boost_regex.regex_iterator.op_eq">operator==</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;)</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">bool</span> <a href="regex_iterator.html#boost_regex.regex_iterator.op_ne">operator!=</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;)</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">&amp;</span> <a href="regex_iterator.html#boost_regex.regex_iterator.op_deref">operator*</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span> <a href="regex_iterator.html#boost_regex.regex_iterator.op_arrow">operator-&gt;</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">regex_iterator</span><span class="special">&amp;</span> <a href="regex_iterator.html#boost_regex.regex_iterator.op_inc">operator++</a><span class="special">();</span>
+   <span class="identifier">regex_iterator</span> <a href="regex_iterator.html#boost_regex.regex_iterator.op_inc2">operator++</a><span class="special">(</span><span class="keyword">int</span><span class="special">);</span>
+<span class="special">};</span>
+
+<span class="keyword">typedef</span> <span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span>                  <span class="identifier">cregex_iterator</span><span class="special">;</span> 
+<span class="keyword">typedef</span> <span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span>  <span class="identifier">sregex_iterator</span><span class="special">;</span> 
+
+<span class="preprocessor">#ifndef</span>  <span class="identifier">BOOST_NO_WREGEX</span>
+<span class="keyword">typedef</span> <span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span>               <span class="identifier">wcregex_iterator</span><span class="special">;</span> 
+<span class="keyword">typedef</span> <span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">wstring</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> <span class="identifier">wsregex_iterator</span><span class="special">;</span> 
+<span class="preprocessor">#endif</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span> <span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <a href="regex_iterator.html#boost_regex.regex_iterator.make">make_regex_iterator</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                       <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span> 
+                       
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span> 
+   <span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+      <a href="regex_iterator.html#boost_regex.regex_iterator.make">make_regex_iterator</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+                          <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                          <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.ref.regex_iterator.description"></a><h4>
+<a name="id547078"></a>
+        <a href="regex_iterator.html#boost_regex.ref.regex_iterator.description">Description</a>
+      </h4>
+<p>
+        A <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>
+        is constructed from a pair of iterators, and enumerates all occurrences of
+        a regular expression within that iterator range.
+      </p>
+<a name="boost_regex.regex_iterator.construct1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_iterator</span><span class="special">();</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs an end of sequence
+        <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>.
+      </p>
+<a name="boost_regex.regex_iterator.construct2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_iterator</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+               <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> that will enumerate
+        all occurrences of the expression <span class="emphasis"><em>re</em></span>, within the sequence
+        [a,b), and found using <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a> <span class="emphasis"><em>m</em></span>.
+        The object <span class="emphasis"><em>re</em></span> must exist for the lifetime of the <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<a name="boost_regex.regex_iterator.construct3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a copy of <tt class="computeroutput"><span class="identifier">that</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Postconditions</b></span>: <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span> <span class="special">==</span> <span class="identifier">that</span></tt>.
+      </p>
+<a name="boost_regex.regex_iterator.assign"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_iterator</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: sets <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> equal to those in <tt class="computeroutput"><span class="identifier">that</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Postconditions</b></span>: *this == that.
+      </p>
+<a name="boost_regex.regex_iterator.op_eq"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="keyword">operator</span><span class="special">==(</span><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns true if *this is equal
+        to that.
+      </p>
+<a name="boost_regex.regex_iterator.op_ne"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="keyword">operator</span><span class="special">!=(</span><span class="keyword">const</span> <span class="identifier">regex_iterator</span><span class="special">&amp;)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">!(*</span><span class="keyword">this</span> <span class="special">==</span> <span class="identifier">that</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.regex_iterator.op_deref"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">*()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: dereferencing a <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> object it yields
+        a const reference to a <a href="match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> object, whose members
+        are set as follows:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Element
+              </p>
+              </th>
+<th>
+              <p>
+                Value
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">size</span><span class="special">()</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">re</span><span class="special">.</span><span class="identifier">mark_count</span><span class="special">()</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">empty</span><span class="special">()</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="keyword">false</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The end of the last match found, or the start of the underlying sequence
+                if this is the first match enumerated
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">last</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The same as the start of the match found: <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                True if the prefix did not match an empty string: <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">first</span> <span class="special">!=</span>
+                <span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The same as the end of the match found: <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">last</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The end of the underlying sequence.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                True if the suffix did not match an empty string: <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">first</span> <span class="special">!=</span>
+                <span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The start of the sequence of characters that matched the regular
+                expression
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The end of the sequence of characters that matched the regular expression
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="number">0</span><span class="special">].</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                true if a full match was found, and false if it was a partial match
+                (found as a result of the match_partial flag being set).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">size</span><span class="special">()</span></tt>,
+                the start of the sequence that matched sub-expression <span class="emphasis"><em>n</em></span>.
+                Alternatively, if sub-expression <span class="emphasis"><em>n</em></span> did not participate
+                in the match, then last.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">size</span><span class="special">()</span></tt>,
+                the end of the sequence that matched sub-expression <span class="emphasis"><em>n</em></span>.
+                Alternatively, if sub-expression <span class="emphasis"><em>n</em></span> did not participate
+                in the match, then last.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">)[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">size</span><span class="special">()</span></tt>,
+                true if sub-expression <span class="emphasis"><em>n</em></span> participated in the
+                match, false otherwise.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">position</span><span class="special">(</span><span class="identifier">n</span><span class="special">)</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="special">(*</span><span class="identifier">it</span><span class="special">).</span><span class="identifier">size</span><span class="special">()</span></tt>,
+                then the distance from the start of the underlying sequence to the
+                start of sub-expression match <span class="emphasis"><em>n</em></span>.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.regex_iterator.op_arrow"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span> <span class="keyword">operator</span><span class="special">-&gt;()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">&amp;(*</span><span class="keyword">this</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.regex_iterator.op_inc"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_iterator</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">++();</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: moves the iterator to the next
+        match in the underlying sequence, or the end of sequence iterator if none
+        if found. When the last match found matched a zero length string, then the
+        <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a>
+        will find the next match as follows: if there exists a non-zero length match
+        that starts at the same location as the last one, then returns it, otherwise
+        starts looking for the next (possibly zero length) match from one position
+        to the right of the last match.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: *this.
+      </p>
+<a name="boost_regex.regex_iterator.op_inc2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_iterator</span> <span class="keyword">operator</span><span class="special">++(</span><span class="keyword">int</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a copy result of <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt>, then
+        calls <tt class="computeroutput"><span class="special">++(*</span><span class="keyword">this</span><span class="special">)</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: result.
+      </p>
+<a name="boost_regex.regex_iterator.make"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+<span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+   <span class="identifier">make_regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                     <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span> 
+                    
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span> 
+<span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <span class="identifier">make_regex_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+                     <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                     <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns an iterator that enumerates
+        all occurences of expression <span class="emphasis"><em>e</em></span> in text <span class="emphasis"><em>p</em></span>
+        using <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>
+        <span class="emphasis"><em>m</em></span>.
+      </p>
+<a name="boost_regex.ref.regex_iterator.examples"></a><h4>
+<a name="id550235"></a>
+        <a href="regex_iterator.html#boost_regex.ref.regex_iterator.examples">Examples</a>
+      </h4>
+<p>
+        The following example takes a C++ source file and builds up an index of class
+        names, and the location of that class in the file.
+      </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">map</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">std</span><span class="special">;</span>
+
+<span class="comment">// purpose:
+</span><span class="comment">// takes the contents of a file in the form of a string
+</span><span class="comment">// and searches for all the C++ class definitions, storing
+</span><span class="comment">// their locations in a map of strings/int's
+</span>
+<span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">difference_type</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">map_type</span><span class="special">;</span>
+
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">re</span> <span class="special">=</span> 
+   <span class="comment">// possibly leading whitespace:   
+</span>   <span class="string">"^[[:space:]]*"</span> 
+   <span class="comment">// possible template declaration:
+</span>   <span class="string">"(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</span>
+   <span class="comment">// class or struct:
+</span>   <span class="string">"(class|struct)[[:space:]]*"</span> 
+   <span class="comment">// leading declspec macros etc:
+</span>   <span class="string">"("</span>
+      <span class="string">"\\&lt;\\w+\\&gt;"</span>
+      <span class="string">"("</span>
+         <span class="string">"[[:blank:]]*\\([^)]*\\)"</span>
+      <span class="string">")?"</span>
+      <span class="string">"[[:space:]]*"</span>
+   <span class="string">")*"</span> 
+   <span class="comment">// the class name
+</span>   <span class="string">"(\\&lt;\\w*\\&gt;)[[:space:]]*"</span> 
+   <span class="comment">// template specialisation parameters
+</span>   <span class="string">"(&lt;[^;:{]+&gt;)?[[:space:]]*"</span>
+   <span class="comment">// terminate in { or :
+</span>   <span class="string">"(\\{|:[^;\\{()]*\\{)"</span><span class="special">;</span>
+
+
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">expression</span><span class="special">(</span><span class="identifier">re</span><span class="special">);</span>
+<span class="identifier">map_type</span> <span class="identifier">class_index</span><span class="special">;</span>
+
+<span class="keyword">bool</span> <span class="identifier">regex_callback</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;&amp;</span> <span class="identifier">what</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="comment">// what[0] contains the whole string
+</span>   <span class="comment">// what[5] contains the class name.
+</span>   <span class="comment">// what[6] contains the template specialisation if any.
+</span>   <span class="comment">// add class name and position to map:
+</span>   <span class="identifier">class_index</span><span class="special">[</span><span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">str</span><span class="special">()</span> <span class="special">+</span> <span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">str</span><span class="special">()]</span> <span class="special">=</span> <span class="identifier">what</span><span class="special">.</span><span class="identifier">position</span><span class="special">(</span><span class="number">5</span><span class="special">);</span>
+   <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
+<span class="special">}</span>
+
+<span class="keyword">void</span> <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">istream</span><span class="special">&amp;</span> <span class="identifier">is</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">s</span><span class="special">.</span><span class="identifier">erase</span><span class="special">();</span>
+   <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">rdbuf</span><span class="special">()-&gt;</span><span class="identifier">in_avail</span><span class="special">());</span>
+   <span class="keyword">char</span> <span class="identifier">c</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">get</span><span class="special">(</span><span class="identifier">c</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="keyword">if</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">==</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">size</span><span class="special">())</span>
+         <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">*</span> <span class="number">3</span><span class="special">);</span>
+      <span class="identifier">s</span><span class="special">.</span><span class="identifier">append</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="identifier">c</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">**</span> <span class="identifier">argv</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">text</span><span class="special">;</span>
+   <span class="keyword">for</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">1</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">argc</span><span class="special">;</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Processing file "</span> <span class="special">&lt;&lt;</span> <span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="identifier">endl</span><span class="special">;</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ifstream</span> <span class="identifier">fs</span><span class="special">(</span><span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]);</span>
+      <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">text</span><span class="special">,</span> <span class="identifier">fs</span><span class="special">);</span>
+      <span class="comment">// construct our iterators:
+</span>      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_iterator</span> <span class="identifier">m1</span><span class="special">(</span><span class="identifier">text</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">text</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">expression</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_iterator</span> <span class="identifier">m2</span><span class="special">;</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">for_each</span><span class="special">(</span><span class="identifier">m1</span><span class="special">,</span> <span class="identifier">m2</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">regex_callback</span><span class="special">);</span>
+      <span class="comment">// copy results:
+</span>      <span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">class_index</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span> <span class="special">&lt;&lt;</span> <span class="string">" matches found"</span> <span class="special">&lt;&lt;</span> <span class="identifier">endl</span><span class="special">;</span>
+      <span class="identifier">map_type</span><span class="special">::</span><span class="identifier">iterator</span> <span class="identifier">c</span><span class="special">,</span> <span class="identifier">d</span><span class="special">;</span>
+      <span class="identifier">c</span> <span class="special">=</span> <span class="identifier">class_index</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span>
+      <span class="identifier">d</span> <span class="special">=</span> <span class="identifier">class_index</span><span class="special">.</span><span class="identifier">end</span><span class="special">();</span>
+      <span class="keyword">while</span><span class="special">(</span><span class="identifier">c</span> <span class="special">!=</span> <span class="identifier">d</span><span class="special">)</span>
+      <span class="special">{</span>
+         <span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"class \""</span> <span class="special">&lt;&lt;</span> <span class="special">(*</span><span class="identifier">c</span><span class="special">).</span><span class="identifier">first</span> <span class="special">&lt;&lt;</span> <span class="string">"\" found at index: "</span> <span class="special">&lt;&lt;</span> <span class="special">(*</span><span class="identifier">c</span><span class="special">).</span><span class="identifier">second</span> <span class="special">&lt;&lt;</span> <span class="identifier">endl</span><span class="special">;</span>
+         <span class="special">++</span><span class="identifier">c</span><span class="special">;</span>
+      <span class="special">}</span>
+      <span class="identifier">class_index</span><span class="special">.</span><span class="identifier">erase</span><span class="special">(</span><span class="identifier">class_index</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">class_index</span><span class="special">.</span><span class="identifier">end</span><span class="special">());</span>
+   <span class="special">}</span>
+   <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_replace.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_token_iterator.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/regex_match.html b/doc/html/boost_regex/ref/regex_match.html
new file mode 100644
index 00000000..55bd6752
--- /dev/null
+++ b/doc/html/boost_regex/ref/regex_match.html
@@ -0,0 +1,421 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> regex_match</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="sub_match.html" title=" sub_match">
+<link rel="next" href="regex_search.html" title=" regex_search">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="sub_match.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_search.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.regex_match"></a><a href="regex_match.html" title=" regex_match"> regex_match</a></h3></div></div></div>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+</pre>
+<p>
+        The algorithm <a href="regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>
+        determines whether a given regular expression matches <span class="bold"><b>all</b></span>
+        of a given character sequence denoted by a pair of bidirectional-iterators,
+        the algorithm is defined as follows, the main use of this function is data
+        input validation.
+      </p>
+<div class="important"><table border="0" summary="Important">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../doc/html/images/important.png"></td>
+<th align="left">Important</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          Note that the result is true only if the expression matches the <span class="bold"><b>whole</b></span> of the input sequence. If you want to search
+          for an expression somewhere within the sequence then use <a href="regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>. If you want to match
+          a prefix of the character string then use <a href="regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a> with the flag match_continuous
+          set.
+        </p></td></tr>
+</table></div>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                 <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                 <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+                 <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.ref.regex_match.description"></a><h4>
+<a name="id530617"></a>
+        <a href="regex_match.html#boost_regex.ref.regex_match.description">Description</a>
+      </h4>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                 <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                 <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: Type BidirectionalIterator meets
+        the requirements of a Bidirectional Iterator (24.1.4).
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Determines whether there is an
+        exact match between the regular expression <span class="emphasis"><em>e</em></span>, and all
+        of the character sequence [first, last), parameter <span class="emphasis"><em>flags</em></span>
+        (see <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>)
+        is used to control how the expression is matched against the character sequence.
+        Returns true if such a match exists, false otherwise.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<p>
+        <span class="bold"><b>Postconditions</b></span>: If the function returns
+        false, then the effect on parameter <span class="emphasis"><em>m</em></span> is undefined,
+        otherwise the effects on parameter <span class="emphasis"><em>m</em></span> are given in the
+        table:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Element
+              </p>
+              </th>
+<th>
+              <p>
+                Value
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">e</span><span class="special">.</span><span class="identifier">mark_count</span><span class="special">()</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">empty</span><span class="special">()</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="keyword">false</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">first</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">last</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">first</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="keyword">false</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">last</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">last</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">last</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="keyword">false</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">first</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">last</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                true if a full match was found, and false if it was a partial match
+                (found as a result of the match_partial flag being set).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>, the start of the sequence that
+                matched sub-expression <span class="emphasis"><em>n</em></span>. Alternatively, if
+                sub-expression <span class="emphasis"><em>n</em></span> did not participate in the
+                match, then <tt class="computeroutput"><span class="identifier">last</span></tt>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>, the end of the sequence that matched
+                sub-expression <span class="emphasis"><em>n</em></span>. Alternatively, if sub-expression
+                <span class="emphasis"><em>n</em></span> did not participate in the match, then <tt class="computeroutput"><span class="identifier">last</span></tt>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>, true if sub-expression <span class="emphasis"><em>n</em></span>
+                participated in the match, false otherwise.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+               <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Behaves "as if" by constructing
+        an instance of <tt class="computeroutput"><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> <span class="identifier">what</span></tt>,
+        and then returning the result of <tt class="computeroutput"><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span>
+        <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+               <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">str</span>
+        <span class="special">+</span> <span class="identifier">char_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;::</span><span class="identifier">length</span><span class="special">(</span><span class="identifier">str</span><span class="special">),</span>
+        <span class="identifier">m</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span>
+         <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+               <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+               <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">m</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+               <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">str</span>
+        <span class="special">+</span> <span class="identifier">char_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;::</span><span class="identifier">length</span><span class="special">(</span><span class="identifier">str</span><span class="special">),</span>
+        <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_match</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">basic_regex</span> <span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+               <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.ref.regex_match.examples"></a><h4>
+<a name="id533809"></a>
+        <a href="regex_match.html#boost_regex.ref.regex_match.examples">Examples</a>
+      </h4>
+<p>
+        The following example processes an ftp response:
+      </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">stdlib</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span> 
+
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">;</span> 
+
+<span class="identifier">regex</span> <span class="identifier">expression</span><span class="special">(</span><span class="string">"([0-9]+)(\\-| |$)(.*)"</span><span class="special">);</span> 
+
+<span class="comment">// process_ftp: 
+</span><span class="comment">// on success returns the ftp response code, and fills 
+</span><span class="comment">// msg with the ftp response message. 
+</span><span class="keyword">int</span> <span class="identifier">process_ftp</span><span class="special">(</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">response</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">*</span> <span class="identifier">msg</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="identifier">cmatch</span> <span class="identifier">what</span><span class="special">;</span> 
+   <span class="keyword">if</span><span class="special">(</span><span class="identifier">regex_match</span><span class="special">(</span><span class="identifier">response</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">expression</span><span class="special">))</span> 
+   <span class="special">{</span> 
+      <span class="comment">// what[0] contains the whole string 
+</span>      <span class="comment">// what[1] contains the response code 
+</span>      <span class="comment">// what[2] contains the separator character 
+</span>      <span class="comment">// what[3] contains the text message. 
+</span>      <span class="keyword">if</span><span class="special">(</span><span class="identifier">msg</span><span class="special">)</span> 
+         <span class="identifier">msg</span><span class="special">-&gt;</span><span class="identifier">assign</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">3</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">3</span><span class="special">].</span><span class="identifier">second</span><span class="special">);</span> 
+      <span class="keyword">return</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">atoi</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">1</span><span class="special">].</span><span class="identifier">first</span><span class="special">);</span> 
+   <span class="special">}</span> 
+   <span class="comment">// failure did not match 
+</span>   <span class="keyword">if</span><span class="special">(</span><span class="identifier">msg</span><span class="special">)</span> 
+      <span class="identifier">msg</span><span class="special">-&gt;</span><span class="identifier">erase</span><span class="special">();</span> 
+   <span class="keyword">return</span> <span class="special">-</span><span class="number">1</span><span class="special">;</span> 
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="sub_match.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_search.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/regex_replace.html b/doc/html/boost_regex/ref/regex_replace.html
new file mode 100644
index 00000000..5c47aaf3
--- /dev/null
+++ b/doc/html/boost_regex/ref/regex_replace.html
@@ -0,0 +1,307 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> regex_replace</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="regex_search.html" title=" regex_search">
+<link rel="next" href="regex_iterator.html" title=" regex_iterator">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_search.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_iterator.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.regex_replace"></a><a href="regex_replace.html" title=" regex_replace"> regex_replace</a></h3></div></div></div>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+</pre>
+<p>
+        The algorithm <a href="regex_replace.html" title=" regex_replace"><tt class="computeroutput"><span class="identifier">regex_replace</span></tt></a> searches through a
+        string finding all the matches to the regular expression: for each match
+        it then calls <a href="match_results.html#boost_regex.match_results_format"><tt class="computeroutput"><span class="identifier">match_results</span><span class="special">&lt;&gt;::</span><span class="identifier">format</span></tt></a> to format the string and
+        sends the result to the output iterator. Sections of text that do not match
+        are copied to the output unchanged only if the <span class="emphasis"><em>flags</em></span>
+        parameter does not have the flag <tt class="computeroutput"><span class="identifier">format_no_copy</span></tt>
+        set. If the flag <tt class="computeroutput"><span class="identifier">format_first_only</span></tt>
+        is set then only the first occurrence is replaced rather than all occurrences.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">OutputIterator</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span>
+                             <span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span>
+                             <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                             <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                             <span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                             <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                                  <span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.ref.regex_replace.description"></a><h4>
+<a name="id541136"></a>
+        <a href="regex_replace.html#boost_regex.ref.regex_replace.description">Description</a>
+      </h4>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">OutputIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">OutputIterator</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">OutputIterator</span> <span class="identifier">out</span><span class="special">,</span>
+                             <span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span>
+                             <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                             <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                             <span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                             <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        Enumerates all the occurences of expression <span class="emphasis"><em>e</em></span> in the
+        sequence [first, last), replacing each occurence with the string that results
+        by merging the match found with the format string <span class="emphasis"><em>fmt</em></span>,
+        and copies the resulting string to <span class="emphasis"><em>out</em></span>.
+      </p>
+<p>
+        If the flag <tt class="computeroutput"><span class="identifier">format_no_copy</span></tt>
+        is set in <span class="emphasis"><em>flags</em></span> then unmatched sections of text are
+        not copied to output.
+      </p>
+<p>
+        If the flag <tt class="computeroutput"><span class="identifier">format_first_only</span></tt>
+        is set in flags then only the first occurence of <span class="emphasis"><em>e</em></span> is
+        replaced.
+      </p>
+<p>
+        The manner in which the format string <span class="emphasis"><em>fmt</em></span> is interpretted,
+        along with the rules used for finding matches, are determined by the flags
+        set in <span class="emphasis"><em>flags</em></span>: see <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> object:
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_iterator</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+                                          <span class="identifier">i</span><span class="special">(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">),</span> 
+</pre>
+<p>
+        and uses <span class="emphasis"><em>i</em></span> to enumerate through all of the matches
+        <span class="emphasis"><em>m</em></span> of type <a href="match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> <tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span></tt>
+        that occur within the sequence [first, last).
+      </p>
+<p>
+        If no such matches are found and
+      </p>
+<pre class="programlisting">
+<span class="special">!(</span><span class="identifier">flags</span> <span class="special">&amp;</span> <span class="identifier">format_no_copy</span><span class="special">)</span> 
+</pre>
+<p>
+        then calls
+      </p>
+<pre class="programlisting">
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">copy</span><span class="special">(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">,</span> <span class="identifier">out</span><span class="special">).</span> 
+</pre>
+<p>
+        Otherwise, for each match found, if
+      </p>
+<pre class="programlisting">
+<span class="special">!(</span><span class="identifier">flags</span> <span class="special">&amp;</span> <span class="identifier">format_no_copy</span><span class="special">)</span> 
+</pre>
+<p>
+        calls
+      </p>
+<pre class="programlisting">
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">copy</span><span class="special">(</span><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">last</span><span class="special">,</span> <span class="identifier">out</span><span class="special">),</span> 
+</pre>
+<p>
+        and then calls
+      </p>
+<pre class="programlisting">
+<span class="identifier">m</span><span class="special">.</span><span class="identifier">format</span><span class="special">(</span><span class="identifier">out</span><span class="special">,</span> <span class="identifier">fmt</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">).</span> 
+</pre>
+<p>
+        Finally if
+      </p>
+<pre class="programlisting">
+<span class="special">!(</span><span class="identifier">flags</span> <span class="special">&amp;</span> <span class="identifier">format_no_copy</span><span class="special">)</span> 
+</pre>
+<p>
+        calls
+      </p>
+<pre class="programlisting">
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">copy</span><span class="special">(</span><span class="identifier">last_m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">last_m</span><span class="special">,</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">last</span><span class="special">,</span> <span class="identifier">out</span><span class="special">)</span> 
+</pre>
+<p>
+        where <span class="emphasis"><em>last_m</em></span> is a copy of the last match found.
+      </p>
+<p>
+        If <tt class="computeroutput"><span class="identifier">flags</span> <span class="special">&amp;</span>
+        <span class="identifier">format_first_only</span></tt> is non-zero then
+        only the first match found is replaced.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: out.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                                  <span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;&amp;</span> <span class="identifier">fmt</span><span class="special">,</span>
+                                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Constructs an object <tt class="computeroutput"><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="identifier">result</span></tt>, calls <tt class="computeroutput"><span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">back_inserter</span><span class="special">(</span><span class="identifier">result</span><span class="special">),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">,</span>
+        <span class="identifier">fmt</span><span class="special">,</span>
+        <span class="identifier">flags</span><span class="special">)</span></tt>,
+        and then returns <tt class="computeroutput"><span class="identifier">result</span></tt>.
+      </p>
+<a name="boost_regex.ref.regex_replace.examples"></a><h4>
+<a name="id542698"></a>
+        <a href="regex_replace.html#boost_regex.ref.regex_replace.examples">Examples</a>
+      </h4>
+<p>
+        The following example takes C/C++ source code as input, and outputs syntax
+        highlighted HTML code.
+      </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">sstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+
+<span class="comment">// purpose:
+</span><span class="comment">// takes the contents of a file and transform to
+</span><span class="comment">// syntax highlighted code in html format
+</span>
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e1</span><span class="special">,</span> <span class="identifier">e2</span><span class="special">;</span>
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">expression_text</span><span class="special">;</span>
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">format_string</span><span class="special">;</span>
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">pre_expression</span><span class="special">;</span>
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">pre_format</span><span class="special">;</span>
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">header_text</span><span class="special">;</span>
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">footer_text</span><span class="special">;</span>
+
+<span class="keyword">void</span> <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">istream</span><span class="special">&amp;</span> <span class="identifier">is</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">s</span><span class="special">.</span><span class="identifier">erase</span><span class="special">();</span>
+   <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">rdbuf</span><span class="special">()-&gt;</span><span class="identifier">in_avail</span><span class="special">());</span>
+   <span class="keyword">char</span> <span class="identifier">c</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">get</span><span class="special">(</span><span class="identifier">c</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="keyword">if</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">==</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">size</span><span class="special">())</span>
+         <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">*</span> <span class="number">3</span><span class="special">);</span>
+      <span class="identifier">s</span><span class="special">.</span><span class="identifier">append</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="identifier">c</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">**</span> <span class="identifier">argv</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="keyword">try</span><span class="special">{</span>
+   <span class="identifier">e1</span><span class="special">.</span><span class="identifier">assign</span><span class="special">(</span><span class="identifier">expression_text</span><span class="special">);</span>
+   <span class="identifier">e2</span><span class="special">.</span><span class="identifier">assign</span><span class="special">(</span><span class="identifier">pre_expression</span><span class="special">);</span>
+   <span class="keyword">for</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">1</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">argc</span><span class="special">;</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Processing file "</span> <span class="special">&lt;&lt;</span> <span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ifstream</span> <span class="identifier">fs</span><span class="special">(</span><span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]);</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">in</span><span class="special">;</span>
+      <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">in</span><span class="special">,</span> <span class="identifier">fs</span><span class="special">);</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">out_name</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">])</span> <span class="special">+</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="string">".htm"</span><span class="special">));</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ofstream</span> <span class="identifier">os</span><span class="special">(</span><span class="identifier">out_name</span><span class="special">.</span><span class="identifier">c_str</span><span class="special">());</span>
+      <span class="identifier">os</span> <span class="special">&lt;&lt;</span> <span class="identifier">header_text</span><span class="special">;</span>
+      <span class="comment">// strip '&lt;' and '&gt;' first by outputting to a
+</span>      <span class="comment">// temporary string stream
+</span>      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostringstream</span> <span class="identifier">t</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ios</span><span class="special">::</span><span class="identifier">out</span> <span class="special">|</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ios</span><span class="special">::</span><span class="identifier">binary</span><span class="special">);</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream_iterator</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">oi</span><span class="special">(</span><span class="identifier">t</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">oi</span><span class="special">,</span> <span class="identifier">in</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">in</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span>
+      <span class="identifier">e2</span><span class="special">,</span> <span class="identifier">pre_format</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_default</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">format_all</span><span class="special">);</span>
+      <span class="comment">// then output to final output stream
+</span>      <span class="comment">// adding syntax highlighting:
+</span>      <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span><span class="special">(</span><span class="identifier">t</span><span class="special">.</span><span class="identifier">str</span><span class="special">());</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream_iterator</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">out</span><span class="special">(</span><span class="identifier">os</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">out</span><span class="special">,</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span>
+      <span class="identifier">e1</span><span class="special">,</span> <span class="identifier">format_string</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_default</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">format_all</span><span class="special">);</span>
+      <span class="identifier">os</span> <span class="special">&lt;&lt;</span> <span class="identifier">footer_text</span><span class="special">;</span>
+   <span class="special">}</span>
+   <span class="special">}</span>
+   <span class="keyword">catch</span><span class="special">(...)</span>
+   <span class="special">{</span> <span class="keyword">return</span> <span class="special">-</span><span class="number">1</span><span class="special">;</span> <span class="special">}</span>
+   <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">pre_expression</span> <span class="special">=</span> <span class="string">"(&lt;)|(&gt;)|(&amp;)|\\r"</span><span class="special">;</span>
+<span class="keyword">extern</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">pre_format</span> <span class="special">=</span> <span class="string">"(?1&lt;)(?2&gt;)(?3&amp;amp;)"</span><span class="special">;</span>
+
+
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">expression_text</span> <span class="special">=</span> 
+   <span class="comment">// preprocessor directives: index 1
+</span>   <span class="string">"(^[[:blank:]]*#(?:[^\\\\\\n]|\\\\[^\\n[:punct:][:word:]]*[\\n[:punct:][:word:]])*)|"</span>
+   <span class="comment">// comment: index 2
+</span>   <span class="string">"(//[^\\n]*|/\\*.*?\\*/)|"</span>
+   <span class="comment">// literals: index 3
+</span>   <span class="string">"\\&lt;([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\\.)?[[:digit:]]+"</span>
+   <span class="string">"(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\\&gt;|"</span>
+   <span class="comment">// string literals: index 4
+</span>   <span class="string">"('(?:[^\\\\']|\\\\.)*'|\"(?:[^\\\\\"]|\\\\.)*\")|"</span>
+   <span class="comment">// keywords: index 5
+</span>   <span class="string">"\\&lt;(__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import"</span>
+   <span class="string">"|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall"</span>
+   <span class="string">"|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|bool"</span>
+   <span class="string">"|break|case|catch|cdecl|char|class|const|const_cast|continue|default|delete"</span>
+   <span class="string">"|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto"</span>
+   <span class="string">"|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected"</span>
+   <span class="string">"|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast"</span>
+   <span class="string">"|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned"</span>
+   <span class="string">"|using|virtual|void|volatile|wchar_t|while)\\&gt;"</span>
+   <span class="special">;</span>
+
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">format_string</span> <span class="special">=</span> <span class="string">"(?1&lt;font color=\"#008040\"&gt;$&amp;&lt;/font&gt;)"</span>
+                           <span class="string">"(?2&lt;I&gt;&lt;font color=\"#000080\"&gt;$&amp;&lt;/font&gt;&lt;/I&gt;)"</span>
+                           <span class="string">"(?3&lt;font color=\"#0000A0\"&gt;$&amp;&lt;/font&gt;)"</span>
+                           <span class="string">"(?4&lt;font color=\"#0000FF\"&gt;$&amp;&lt;/font&gt;)"</span>
+                           <span class="string">"(?5&lt;B&gt;$&amp;&lt;/B&gt;)"</span><span class="special">;</span>
+
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">header_text</span> <span class="special">=</span> 
+   <span class="string">"&lt;HTML&gt;\n&lt;HEAD&gt;\n"</span>
+   <span class="string">"&lt;TITLE&gt;Auto-generated html formated source&lt;/TITLE&gt;\n"</span>
+   <span class="string">"&lt;META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=windows-1252\"&gt;\n"</span>
+   <span class="string">"&lt;/HEAD&gt;\n"</span>
+   <span class="string">"&lt;BODY LINK=\"#0000ff\" VLINK=\"#800080\" BGCOLOR=\"#ffffff\"&gt;\n"</span>
+   <span class="string">"&lt;P&gt; &lt;/P&gt;\n&lt;PRE&gt;"</span><span class="special">;</span>
+
+<span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">footer_text</span> <span class="special">=</span> <span class="string">"&lt;/PRE&gt;\n&lt;/BODY&gt;\n\n"</span><span class="special">;</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_search.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_iterator.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/regex_search.html b/doc/html/boost_regex/ref/regex_search.html
new file mode 100644
index 00000000..196ac687
--- /dev/null
+++ b/doc/html/boost_regex/ref/regex_search.html
@@ -0,0 +1,430 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> regex_search</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="regex_match.html" title=" regex_match">
+<link rel="next" href="regex_replace.html" title=" regex_replace">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_match.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_replace.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.regex_search"></a><a href="regex_search.html" title=" regex_search"> regex_search</a></h3></div></div></div>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+</pre>
+<p>
+        The algorithm <a href="regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a> will search a range
+        denoted by a pair of bidirectional-iterators for a given regular expression.
+        The algorithm uses various heuristics to reduce the search time by only checking
+        for a match if a match could conceivably start at that position. The algorithm
+        is defined as follows:
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> 
+         <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                  <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+                  
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> 
+         <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+                  <span class="identifier">match_results</span><span class="special">&lt;</span>
+                     <span class="keyword">typename</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span><span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> 
+                     <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+          
+<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span> 
+                  <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+                  
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>                
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+                  
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span> 
+                  
+<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.ref.regex_search.description"></a><h4>
+<a name="id536028"></a>
+        <a href="regex_search.html#boost_regex.ref.regex_search.description">Description</a>
+      </h4>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">last</span><span class="special">,</span>
+                  <span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Requires</b></span>: Type BidirectionalIterator meets
+        the requirements of a Bidirectional Iterator (24.1.4).
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: Determines whether there is some
+        sub-sequence within [first,last) that matches the regular expression <span class="emphasis"><em>e</em></span>,
+        parameter <span class="emphasis"><em>flags</em></span> is used to control how the expression
+        is matched against the character sequence. Returns true if such a sequence
+        exists, false otherwise.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<p>
+        <span class="bold"><b>Postconditions</b></span>: If the function returns
+        false, then the effect on parameter <span class="emphasis"><em>m</em></span> is undefined,
+        otherwise the effects on parameter <span class="emphasis"><em>m</em></span> are given in the
+        table:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Element
+              </p>
+              </th>
+<th>
+              <p>
+                Value
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">e</span><span class="special">.</span><span class="identifier">mark_count</span><span class="special">()</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">empty</span><span class="special">()</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="keyword">false</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">first</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">last</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">first</span> <span class="special">!=</span>
+                <span class="identifier">m</span><span class="special">.</span><span class="identifier">prefix</span><span class="special">().</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">last</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">last</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">first</span> <span class="special">!=</span>
+                <span class="identifier">m</span><span class="special">.</span><span class="identifier">suffix</span><span class="special">().</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The start of the sequence of characters that matched the regular
+                expression
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The end of the sequence of characters that matched the regular expression
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                true if a full match was found, and false if it was a partial match
+                (found as a result of the match_partial flag being set).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">first</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>, the start of the sequence that
+                matched sub-expression <span class="emphasis"><em>n</em></span>. Alternatively, if
+                sub-expression <span class="emphasis"><em>n</em></span> did not participate in the
+                match, then last.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">second</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>, the end of the sequence that matched
+                sub-expression <span class="emphasis"><em>n</em></span>. Alternatively, if sub-expression
+                <span class="emphasis"><em>n</em></span> did not participate in the match, then <tt class="computeroutput"><span class="identifier">last</span></tt>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">m</span><span class="special">[</span><span class="identifier">n</span><span class="special">].</span><span class="identifier">matched</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                For all integers <tt class="computeroutput"><span class="identifier">n</span> <span class="special">&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>, true if sub-expression <span class="emphasis"><em>n</em></span>
+                participated in the match, false otherwise.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span><span class="special">,</span> <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">str</span>
+        <span class="special">+</span> <span class="identifier">char_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;::</span><span class="identifier">length</span><span class="special">(</span><span class="identifier">str</span><span class="special">),</span>
+        <span class="identifier">m</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span>
+         <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                  <span class="identifier">match_results</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">m</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">iterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">iterator</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">iterator</span> <span class="identifier">last</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Behaves "as if" by constructing
+        an instance of <tt class="computeroutput"><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> <span class="identifier">what</span></tt>,
+        and then returning the result of <tt class="computeroutput"><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">e</span><span class="special">,</span>
+        <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">str</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">str</span>
+        <span class="special">+</span> <span class="identifier">char_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;::</span><span class="identifier">length</span><span class="special">(</span><span class="identifier">str</span><span class="special">),</span>
+        <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="identifier">regex_search</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span>
+                  <span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Returns the result of <tt class="computeroutput"><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.ref.regex_search.examples"></a><h4>
+<a name="id539302"></a>
+        <a href="regex_search.html#boost_regex.ref.regex_search.examples">Examples</a>
+      </h4>
+<p>
+        The following example, takes the contents of a file in the form of a string,
+        and searches for all the C++ class declarations in the file. The code will
+        work regardless of the way that <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></tt>
+        is implemented, for example it could easily be modified to work with the
+        SGI rope class, which uses a non-contiguous storage strategy.
+      </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">string</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">map</span><span class="special">&gt;</span> 
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> 
+
+<span class="comment">// purpose: 
+</span><span class="comment">// takes the contents of a file in the form of a string 
+</span><span class="comment">// and searches for all the C++ class definitions, storing 
+</span><span class="comment">// their locations in a map of strings/int's 
+</span><span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">map_type</span><span class="special">;</span> 
+
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">expression</span><span class="special">(</span>
+   <span class="string">"^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</span>
+   <span class="string">"(class|struct)[[:space:]]*"</span>
+   <span class="string">"(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?"</span>
+   <span class="string">"[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*"</span>
+   <span class="string">"(&lt;[^;:{]+&gt;[[:space:]]*)?(\\{|:[^;\\{()]*\\{)"</span><span class="special">);</span> 
+
+<span class="keyword">void</span> <span class="identifier">IndexClasses</span><span class="special">(</span><span class="identifier">map_type</span><span class="special">&amp;</span> <span class="identifier">m</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">file</span><span class="special">)</span> 
+<span class="special">{</span> 
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">;</span> 
+   <span class="identifier">start</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span> 
+   <span class="identifier">end</span> <span class="special">=</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">end</span><span class="special">();</span> 
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_results</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> <span class="identifier">what</span><span class="special">;</span> 
+   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">flags</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">;</span> 
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">start</span><span class="special">,</span> <span class="identifier">end</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">expression</span><span class="special">,</span> <span class="identifier">flags</span><span class="special">))</span> 
+   <span class="special">{</span> 
+      <span class="comment">// what[0] contains the whole string 
+</span>      <span class="comment">// what[5] contains the class name. 
+</span>      <span class="comment">// what[6] contains the template specialisation if any. 
+</span>      <span class="comment">// add class name and position to map: 
+</span>      <span class="identifier">m</span><span class="special">[</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">second</span><span class="special">)</span> 
+            <span class="special">+</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">what</span><span class="special">[</span><span class="number">6</span><span class="special">].</span><span class="identifier">second</span><span class="special">)]</span> 
+         <span class="special">=</span> <span class="identifier">what</span><span class="special">[</span><span class="number">5</span><span class="special">].</span><span class="identifier">first</span> <span class="special">-</span> <span class="identifier">file</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span> 
+      <span class="comment">// update search position: 
+</span>      <span class="identifier">start</span> <span class="special">=</span> <span class="identifier">what</span><span class="special">[</span><span class="number">0</span><span class="special">].</span><span class="identifier">second</span><span class="special">;</span> 
+      <span class="comment">// update flags: 
+</span>      <span class="identifier">flags</span> <span class="special">|=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_prev_avail</span><span class="special">;</span> 
+      <span class="identifier">flags</span> <span class="special">|=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">match_not_bob</span><span class="special">;</span> 
+   <span class="special">}</span> 
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_match.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_replace.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/regex_token_iterator.html b/doc/html/boost_regex/ref/regex_token_iterator.html
new file mode 100644
index 00000000..292ff6b0
--- /dev/null
+++ b/doc/html/boost_regex/ref/regex_token_iterator.html
@@ -0,0 +1,524 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> regex_token_iterator</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="regex_iterator.html" title=" regex_iterator">
+<link rel="next" href="bad_expression.html" title=" bad_expression">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="bad_expression.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.regex_token_iterator"></a><a href="regex_token_iterator.html" title=" regex_token_iterator"> regex_token_iterator</a></h3></div></div></div>
+<p>
+        The template class <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> is an iterator
+        adapter; that is to say it represents a new view of an existing iterator
+        sequence, by enumerating all the occurrences of a regular expression within
+        that sequence, and presenting one or more character sequence for each match
+        found. Each position enumerated by the iterator is a <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> object that represents
+        what matched a particular sub-expression within the regular expression. When
+        class <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> is used to
+        enumerate a single sub-expression with index -1, then the iterator performs
+        field splitting: that is to say it enumerates one character sequence for
+        each section of the character container sequence that does not match the
+        regular expression specified.
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> 
+         <span class="keyword">class</span> <span class="identifier">charT</span> <span class="special">=</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span>
+         <span class="keyword">class</span> <span class="identifier">traits</span> <span class="special">=</span> <span class="identifier">regex_traits</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">regex_token_iterator</span> 
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+   <span class="keyword">typedef</span>          <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span>                              <span class="identifier">regex_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>                        <span class="identifier">value_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">difference_type</span> <span class="identifier">difference_type</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span>                                       <span class="identifier">pointer</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">&amp;</span>                                       <span class="identifier">reference</span><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">std</span><span class="special">::</span><span class="identifier">forward_iterator_tag</span>                               <span class="identifier">iterator_category</span><span class="special">;</span>
+   
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.construct1">regex_token_iterator</a><span class="special">();</span>
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.construct2">regex_token_iterator</a><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> 
+                        <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+                        <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+                        <span class="keyword">int</span> <span class="identifier">submatch</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+                        <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.construct3">regex_token_iterator</a><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> 
+                        <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+                        <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+                        <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatches</span><span class="special">,</span> 
+                        <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+   <span class="keyword">template</span> <span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.construct4">regex_token_iterator</a><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> 
+                        <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+                        <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+                        <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatches</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+                        <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.construct5">regex_token_iterator</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;);</span>
+   <span class="identifier">regex_token_iterator</span><span class="special">&amp;</span> <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.assign">operator=</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;);</span>
+   <span class="keyword">bool</span> <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.op_eq">operator==</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;)</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">bool</span> <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.op_ne">operator!=</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;)</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">&amp;</span> <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.op_deref">operator*</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span> <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.op_arrow">operator-&gt;</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">regex_token_iterator</span><span class="special">&amp;</span> <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.op_inc1">operator++</a><span class="special">();</span>
+   <span class="identifier">regex_token_iterator</span> <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.op_inc2">operator++</a><span class="special">(</span><span class="keyword">int</span><span class="special">);</span>
+<span class="special">};</span>
+
+<span class="keyword">typedef</span> <span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span>                   <span class="identifier">cregex_token_iterator</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span>   <span class="identifier">sregex_token_iterator</span><span class="special">;</span>
+<span class="preprocessor">#ifndef</span> <span class="identifier">BOOST_NO_WREGEX</span>
+<span class="keyword">typedef</span> <span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span>                <span class="identifier">wcregex_token_iterator</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">regex_token_iterator</span><span class="special">&lt;&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">wstring</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span> <span class="identifier">wsregex_token_iterator</span><span class="special">;</span>
+<span class="preprocessor">#endif</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.make">make_regex_token_iterator</a><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">submatch</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                             
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.make">make_regex_token_iterator</a><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">submatch</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                             
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+<a href="regex_token_iterator.html#boost_regex.regex_token_iterator.make">make_regex_token_iterator</a><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                            
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.make">make_regex_token_iterator</a><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                             
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.make">make_regex_token_iterator</a><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                             
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span>
+      <span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <a href="regex_token_iterator.html#boost_regex.regex_token_iterator.make">make_regex_token_iterator</a><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.ref.regex_token_iterator.description"></a><h4>
+<a name="id556067"></a>
+        <a href="regex_token_iterator.html#boost_regex.ref.regex_token_iterator.description">Description</a>
+      </h4>
+<a name="boost_regex.regex_token_iterator.construct1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_token_iterator</span><span class="special">();</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs an end of sequence iterator.
+      </p>
+<a name="boost_regex.regex_token_iterator.construct2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_token_iterator</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> 
+                     <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+                     <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+                     <span class="keyword">int</span> <span class="identifier">submatch</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+                     <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Preconditions</b></span>: <tt class="computeroutput"><span class="special">!</span><span class="identifier">re</span><span class="special">.</span><span class="identifier">empty</span><span class="special">()</span></tt>. Object <span class="emphasis"><em>re</em></span> shall exist
+        for the lifetime of the iterator constructed from it.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> that will enumerate
+        one string for each regular expression match of the expression <span class="emphasis"><em>re</em></span>
+        found within the sequence [a,b), using match flags <span class="emphasis"><em>m</em></span>
+        (see <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>).
+        The string enumerated is the sub-expression <span class="emphasis"><em>submatch</em></span>
+        for each match found; if <span class="emphasis"><em>submatch</em></span> is -1, then enumerates
+        all the text sequences that did not match the expression <span class="emphasis"><em>re</em></span>
+        (that is to performs field splitting).
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<a name="boost_regex.regex_token_iterator.construct3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_token_iterator</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> 
+                     <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+                     <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+                     <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatches</span><span class="special">,</span> 
+                     <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Preconditions</b></span>: <tt class="computeroutput"><span class="identifier">submatches</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span>
+        <span class="special">&amp;&amp;</span> <span class="special">!</span><span class="identifier">re</span><span class="special">.</span><span class="identifier">empty</span><span class="special">()</span></tt>. Object <span class="emphasis"><em>re</em></span> shall exist
+        for the lifetime of the iterator constructed from it.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> that will enumerate
+        <tt class="computeroutput"><span class="identifier">submatches</span><span class="special">.</span><span class="identifier">size</span><span class="special">()</span></tt>
+        strings for each regular expression match of the expression <span class="emphasis"><em>re</em></span>
+        found within the sequence [a,b), using match flags <span class="emphasis"><em>m</em></span>
+        (see <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>).
+        For each match found one string will be enumerated for each sub-expression
+        index contained within submatches vector; if <tt class="computeroutput"><span class="identifier">submatches</span><span class="special">[</span><span class="number">0</span><span class="special">]</span></tt>
+        is -1, then the first string enumerated for each match will be all of the
+        text from end of the last match to the start of the current match, in addition
+        there will be one extra string enumerated when no more matches can be found:
+        from the end of the last match found, to the end of the underlying sequence.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<a name="boost_regex.regex_token_iterator.construct4"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">(</span><span class="identifier">BidirectionalIterator</span> <span class="identifier">a</span><span class="special">,</span> 
+                     <span class="identifier">BidirectionalIterator</span> <span class="identifier">b</span><span class="special">,</span> 
+                     <span class="keyword">const</span> <span class="identifier">regex_type</span><span class="special">&amp;</span> <span class="identifier">re</span><span class="special">,</span> 
+                     <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatches</span><span class="special">)[</span><span class="identifier">R</span><span class="special">],</span> 
+                     <span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Preconditions</b></span>: <tt class="computeroutput"><span class="special">!</span><span class="identifier">re</span><span class="special">.</span><span class="identifier">empty</span><span class="special">()</span></tt>. Object <span class="emphasis"><em>re</em></span> shall exist
+        for the lifetime of the iterator constructed from it.
+      </p>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> that will enumerate
+        <span class="emphasis"><em>R</em></span> strings for each regular expression match of the expression
+        <span class="emphasis"><em>re</em></span> found within the sequence [a,b), using match flags
+        <span class="emphasis"><em>m</em></span> (see <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>). For each match
+        found one string will be enumerated for each sub-expression index contained
+        within the <span class="emphasis"><em>submatches</em></span> array; if <tt class="computeroutput"><span class="identifier">submatches</span><span class="special">[</span><span class="number">0</span><span class="special">]</span></tt>
+        is -1, then the first string enumerated for each match will be all of the
+        text from end of the last match to the start of the current match, in addition
+        there will be one extra string enumerated when no more matches can be found:
+        from the end of the last match found, to the end of the underlying sequence.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<a name="boost_regex.regex_token_iterator.construct5"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_token_iterator</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a copy of <tt class="computeroutput"><span class="identifier">that</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Postconditions</b></span>: <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span> <span class="special">==</span> <span class="identifier">that</span></tt>.
+      </p>
+<a name="boost_regex.regex_token_iterator.assign"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_token_iterator</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">=(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;</span> <span class="identifier">that</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: sets <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> to be equal to <tt class="computeroutput"><span class="identifier">that</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Postconditions</b></span>: <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span> <span class="special">==</span> <span class="identifier">that</span></tt>.
+      </p>
+<a name="boost_regex.regex_token_iterator.op_eq"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="keyword">operator</span><span class="special">==(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns true if <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> is the same position as <tt class="computeroutput"><span class="identifier">that</span></tt>.
+      </p>
+<a name="boost_regex.regex_token_iterator.op_ne"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="keyword">operator</span><span class="special">!=(</span><span class="keyword">const</span> <span class="identifier">regex_token_iterator</span><span class="special">&amp;)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">!(*</span><span class="keyword">this</span> <span class="special">==</span> <span class="identifier">that</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.regex_token_iterator.op_deref"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">*()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns the current character sequence
+        being enumerated.
+      </p>
+<a name="boost_regex.regex_token_iterator.op_arrow"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span> <span class="keyword">operator</span><span class="special">-&gt;()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">&amp;(*</span><span class="keyword">this</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.regex_token_iterator.op_inc1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_token_iterator</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">++();</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: Moves on to the next character
+        sequence to be enumerated.
+      </p>
+<p>
+        <span class="bold"><b>Throws</b></span>: <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></tt>
+        if the complexity of matching the expression against an N character string
+        begins to exceed O(N<sup>2</sup>), or if the program runs out of stack space while matching
+        the expression (if Boost.Regex is configured in recursive mode), or if the
+        matcher exhausts its permitted memory allocation (if Boost.Regex is configured
+        in non-recursive mode).
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt>.
+      </p>
+<a name="boost_regex.regex_token_iterator.op_inc2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">regex_token_iterator</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">++(</span><span class="keyword">int</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: constructs a copy result of <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt>, then
+        calls <tt class="computeroutput"><span class="special">++(*</span><span class="keyword">this</span><span class="special">)</span></tt>.
+      </p>
+<p>
+        <span class="bold"><b>Returns</b></span>: result.
+      </p>
+<a name="boost_regex.regex_token_iterator.make"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">submatch</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                          
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">int</span> <span class="identifier">submatch</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                             
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+<span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                            
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <span class="identifier">N</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span>
+      <span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="keyword">int</span> <span class="special">(&amp;</span><span class="identifier">submatch</span><span class="special">)[</span><span class="identifier">N</span><span class="special">],</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                             
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+                             
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ST</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">SA</span><span class="special">&gt;</span>
+<span class="identifier">regex_token_iterator</span><span class="special">&lt;</span>
+      <span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;::</span><span class="identifier">const_iterator</span><span class="special">,</span> <span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;</span> 
+   <span class="identifier">make_regex_token_iterator</span><span class="special">(</span>
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">ST</span><span class="special">,</span> <span class="identifier">SA</span><span class="special">&gt;&amp;</span> <span class="identifier">p</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">basic_regex</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">e</span><span class="special">,</span> 
+         <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;&amp;</span> <span class="identifier">submatch</span><span class="special">,</span> 
+         <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_flag_type</span> <span class="identifier">m</span> <span class="special">=</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">match_default</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns a <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a> that enumerates
+        one <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        for each value in <span class="emphasis"><em>submatch</em></span> for each occurrence of regular
+        expression <span class="emphasis"><em>e</em></span> in string <span class="emphasis"><em>p</em></span>, matched
+        using <a href="match_flag_type.html" title=" match_flag_type"><tt class="computeroutput"><span class="identifier">match_flag_type</span></tt></a>
+        <span class="emphasis"><em>m</em></span>.
+      </p>
+<a name="boost_regex.ref.regex_token_iterator.examples"></a><h4>
+<a name="id560313"></a>
+        <a href="regex_token_iterator.html#boost_regex.ref.regex_token_iterator.examples">Examples</a>
+      </h4>
+<p>
+        The following example takes a string and splits it into a series of tokens:
+      </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">std</span><span class="special">;</span>
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">string</span> <span class="identifier">s</span><span class="special">;</span>
+   <span class="keyword">do</span><span class="special">{</span>
+      <span class="keyword">if</span><span class="special">(</span><span class="identifier">argc</span> <span class="special">==</span> <span class="number">1</span><span class="special">)</span>
+      <span class="special">{</span>
+         <span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Enter text to split (or \"quit\" to exit): "</span><span class="special">;</span>
+         <span class="identifier">getline</span><span class="special">(</span><span class="identifier">cin</span><span class="special">,</span> <span class="identifier">s</span><span class="special">);</span>
+         <span class="keyword">if</span><span class="special">(</span><span class="identifier">s</span> <span class="special">==</span> <span class="string">"quit"</span><span class="special">)</span> <span class="keyword">break</span><span class="special">;</span>
+      <span class="special">}</span>
+      <span class="keyword">else</span>
+         <span class="identifier">s</span> <span class="special">=</span> <span class="string">"This is a string of tokens"</span><span class="special">;</span>
+
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">re</span><span class="special">(</span><span class="string">"\\s+"</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_token_iterator</span> <span class="identifier">i</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">re</span><span class="special">,</span> <span class="special">-</span><span class="number">1</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_token_iterator</span> <span class="identifier">j</span><span class="special">;</span>
+
+      <span class="keyword">unsigned</span> <span class="identifier">count</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+      <span class="keyword">while</span><span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span>
+      <span class="special">{</span>
+         <span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">i</span><span class="special">++</span> <span class="special">&lt;&lt;</span> <span class="identifier">endl</span><span class="special">;</span>
+         <span class="identifier">count</span><span class="special">++;</span>
+      <span class="special">}</span>
+      <span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"There were "</span> <span class="special">&lt;&lt;</span> <span class="identifier">count</span> <span class="special">&lt;&lt;</span> <span class="string">" tokens found."</span> <span class="special">&lt;&lt;</span> <span class="identifier">endl</span><span class="special">;</span>
+
+   <span class="special">}</span><span class="keyword">while</span><span class="special">(</span><span class="identifier">argc</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
+   <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+<p>
+        The following example takes a html file and outputs a list of all the linked
+        files:
+      </p>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)\""</span><span class="special">,</span>
+               <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">normal</span> <span class="special">|</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regbase</span><span class="special">::</span><span class="identifier">icase</span><span class="special">);</span>
+
+<span class="keyword">void</span> <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">istream</span><span class="special">&amp;</span> <span class="identifier">is</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">s</span><span class="special">.</span><span class="identifier">erase</span><span class="special">();</span>
+   <span class="comment">//
+</span>   <span class="comment">// attempt to grow string buffer to match file size,
+</span>   <span class="comment">// this doesn't always work...
+</span>   <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">rdbuf</span><span class="special">()-&gt;</span><span class="identifier">in_avail</span><span class="special">());</span>
+   <span class="keyword">char</span> <span class="identifier">c</span><span class="special">;</span>
+   <span class="keyword">while</span><span class="special">(</span><span class="identifier">is</span><span class="special">.</span><span class="identifier">get</span><span class="special">(</span><span class="identifier">c</span><span class="special">))</span>
+   <span class="special">{</span>
+      <span class="comment">// use logarithmic growth stategy, in case
+</span>      <span class="comment">// in_avail (above) returned zero:
+</span>      <span class="keyword">if</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">==</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">size</span><span class="special">())</span>
+         <span class="identifier">s</span><span class="special">.</span><span class="identifier">reserve</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">capacity</span><span class="special">()</span> <span class="special">*</span> <span class="number">3</span><span class="special">);</span>
+      <span class="identifier">s</span><span class="special">.</span><span class="identifier">append</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="identifier">c</span><span class="special">);</span>
+   <span class="special">}</span>
+<span class="special">}</span>
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">**</span> <span class="identifier">argv</span><span class="special">)</span>
+<span class="special">{</span>
+   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span><span class="special">;</span>
+   <span class="keyword">int</span> <span class="identifier">i</span><span class="special">;</span>
+   <span class="keyword">for</span><span class="special">(</span><span class="identifier">i</span> <span class="special">=</span> <span class="number">1</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">argc</span><span class="special">;</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Findings URL's in "</span> <span class="special">&lt;&lt;</span> <span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="string">":"</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="identifier">s</span><span class="special">.</span><span class="identifier">erase</span><span class="special">();</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ifstream</span> <span class="identifier">is</span><span class="special">(</span><span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]);</span>
+      <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">is</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_token_iterator</span> <span class="identifier">i</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">,</span> <span class="number">1</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_token_iterator</span> <span class="identifier">j</span><span class="special">;</span>
+      <span class="keyword">while</span><span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span>
+      <span class="special">{</span>
+         <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">i</span><span class="special">++</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="special">}</span>
+   <span class="special">}</span>
+   <span class="comment">//
+</span>   <span class="comment">// alternative method:
+</span>   <span class="comment">// test the array-literal constructor, and split out the whole
+</span>   <span class="comment">// match as well as $1....
+</span>   <span class="comment">//
+</span>   <span class="keyword">for</span><span class="special">(</span><span class="identifier">i</span> <span class="special">=</span> <span class="number">1</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">argc</span><span class="special">;</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
+   <span class="special">{</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Findings URL's in "</span> <span class="special">&lt;&lt;</span> <span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="string">":"</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="identifier">s</span><span class="special">.</span><span class="identifier">erase</span><span class="special">();</span>
+      <span class="identifier">std</span><span class="special">::</span><span class="identifier">ifstream</span> <span class="identifier">is</span><span class="special">(</span><span class="identifier">argv</span><span class="special">[</span><span class="identifier">i</span><span class="special">]);</span>
+      <span class="identifier">load_file</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">is</span><span class="special">);</span>
+      <span class="keyword">const</span> <span class="keyword">int</span> <span class="identifier">subs</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span><span class="number">1</span><span class="special">,</span> <span class="number">0</span><span class="special">,};</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_token_iterator</span> <span class="identifier">i</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">begin</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">end</span><span class="special">(),</span> <span class="identifier">e</span><span class="special">,</span> <span class="identifier">subs</span><span class="special">);</span>
+      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">sregex_token_iterator</span> <span class="identifier">j</span><span class="special">;</span>
+      <span class="keyword">while</span><span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span>
+      <span class="special">{</span>
+         <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">i</span><span class="special">++</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+      <span class="special">}</span>
+   <span class="special">}</span>
+
+   <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="regex_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="bad_expression.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/regex_traits.html b/doc/html/boost_regex/ref/regex_traits.html
new file mode 100644
index 00000000..f358fb18
--- /dev/null
+++ b/doc/html/boost_regex/ref/regex_traits.html
@@ -0,0 +1,107 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> regex_traits</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="error_type.html" title=" error_type">
+<link rel="next" href="non_std_strings.html" title=" Interfacing With Non-Standard
+      String Types">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="error_type.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="non_std_strings.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.regex_traits"></a><a href="regex_traits.html" title=" regex_traits"> regex_traits</a></h3></div></div></div>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">implementationT</span> <span class="special">=</span> <span class="identifier">sensible_default_choice</span><span class="special">&gt;</span>
+<span class="keyword">struct</span> <span class="identifier">regex_traits</span> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">implementationT</span>
+<span class="special">{</span>
+   <span class="identifier">regex_traits</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">implementationT</span><span class="special">()</span> <span class="special">{}</span>
+<span class="special">};</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="keyword">struct</span> <span class="identifier">c_regex_traits</span><span class="special">;</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="keyword">struct</span> <span class="identifier">cpp_regex_traits</span><span class="special">;</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">&gt;</span>
+<span class="keyword">struct</span> <span class="identifier">w32_regex_traits</span><span class="special">;</span>
+
+<span class="special">}</span> <span class="comment">// namespace boost
+</span></pre>
+<a name="boost_regex.ref.regex_traits.description"></a><h4>
+<a name="id570424"></a>
+        <a href="regex_traits.html#boost_regex.ref.regex_traits.description">Description</a>
+      </h4>
+<p>
+        The class <tt class="computeroutput"><span class="identifier">regex_traits</span></tt> is
+        just a thin wrapper around an actual implemention class, which may be one
+        of:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+<tt class="computeroutput"><span class="identifier">c_regex_traits</span></tt>: 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.
+        </li>
+<li>
+<tt class="computeroutput"><span class="identifier">cpp_regex_traits</span></tt>: the default
+          traits class for non-Win32 platforms, allows the regex class to be imbued
+          with a std::locale instance.
+        </li>
+<li>
+<tt class="computeroutput"><span class="identifier">w32_regex_traits</span></tt>: the default
+          traits class implementation on Win32 platforms, allows the regex class
+          to be imbued with an LCID.
+        </li>
+</ul></div>
+<p>
+        The default behavior can be altered by defining one of the following configuration
+        macros in <a href="../../../../../../boost/regex/user.hpp" target="_top">boost/regex/user.hpp</a>
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          BOOST_REGEX_USE_C_LOCALE: makes <tt class="computeroutput"><span class="identifier">c_regex_traits</span></tt>
+          the default.
+        </li>
+<li>
+          BOOST_REGEX_USE_CPP_LOCALE: makes <tt class="computeroutput"><span class="identifier">cpp_regex_traits</span></tt>
+          the default.
+        </li>
+</ul></div>
+<p>
+        All these traits classes fulfil the <a href="concepts/traits_concept.html" title=" Traits Class
+        Requirements">traits
+        class requirements</a>.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="error_type.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="non_std_strings.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/sub_match.html b/doc/html/boost_regex/ref/sub_match.html
new file mode 100644
index 00000000..25d88d03
--- /dev/null
+++ b/doc/html/boost_regex/ref/sub_match.html
@@ -0,0 +1,1102 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> sub_match</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="match_results.html" title=" match_results">
+<link rel="next" href="regex_match.html" title=" regex_match">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="match_results.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_match.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.sub_match"></a><a href="sub_match.html" title=" sub_match"> sub_match</a></h3></div></div></div>
+<pre class="programlisting">
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">regex</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+        Regular expressions are different from many simple pattern-matching algorithms
+        in that as well as finding an overall match they can also produce sub-expression
+        matches: each sub-expression being delimited in the pattern by a pair of
+        parenthesis (...). There has to be some method for reporting sub-expression
+        matches back to the user: this is achieved this by defining a class <a href="match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>
+        that acts as an indexed collection of sub-expression matches, each sub-expression
+        match being contained in an object of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>.
+      </p>
+<p>
+        Objects of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        may only be obtained by subscripting an object of type <a href="match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a>.
+      </p>
+<p>
+        Objects of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        may be compared to objects of type <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span></tt>,
+        or <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span></tt> or <tt class="computeroutput"><span class="keyword">const</span>
+        <span class="identifier">charT</span></tt>.
+      </p>
+<p>
+        Objects of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        may be added to objects of type <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span></tt>,
+        or <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">charT</span><span class="special">*</span></tt> or <tt class="computeroutput"><span class="keyword">const</span>
+        <span class="identifier">charT</span></tt>, to produce a new <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span></tt>
+        object.
+      </p>
+<p>
+        When the marked sub-expression denoted by an object of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> participated in a regular
+        expression match then member <span class="emphasis"><em>matched</em></span> evaluates to <span class="emphasis"><em>true</em></span>,
+        and members <span class="emphasis"><em>first</em></span> and <span class="emphasis"><em>second</em></span> denote
+        the range of characters [first,second) which formed that match. Otherwise
+        <span class="emphasis"><em>matched</em></span> is <span class="emphasis"><em>false</em></span>, and members
+        <span class="emphasis"><em>first</em></span> and <span class="emphasis"><em>second</em></span> contained undefined
+        values.
+      </p>
+<p>
+        When the marked sub-expression denoted by an object of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> was repeated, then the
+        <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        object represents the match obtained by the <span class="emphasis"><em>last</em></span> repeat.
+        The complete set of all the captures obtained for all the repeats, may be
+        accessed via the captures() member function (Note: this has serious performance
+        implications, you have to explicitly enable this feature).
+      </p>
+<p>
+        If an object of type <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> represents sub-expression
+        0 - that is to say the whole match - then member <span class="emphasis"><em>matched</em></span>
+        is always <span class="emphasis"><em>true</em></span>, unless a <a href="../partial_matches.html" title=" Partial Matches">partial
+        match</a> was obtained as a result of the flag <tt class="computeroutput"><span class="identifier">match_partial</span></tt>
+        being passed to a regular expression algorithm, in which case member <span class="emphasis"><em>matched</em></span>
+        is <span class="emphasis"><em>false</em></span>, and members <span class="emphasis"><em>first</em></span> and
+        <span class="emphasis"><em>second</em></span> represent the character range that formed the
+        partial match.
+      </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">{</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">sub_match</span><span class="special">;</span>
+
+<span class="keyword">typedef</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*&gt;</span>                    <span class="identifier">csub_match</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">wchar_t</span><span class="special">*&gt;</span>                 <span class="identifier">wcsub_match</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span>    <span class="identifier">ssub_match</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">wstring</span><span class="special">::</span><span class="identifier">const_iterator</span><span class="special">&gt;</span>   <span class="identifier">wssub_match</span><span class="special">;</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">class</span> <span class="identifier">sub_match</span> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span>       <a href="sub_match.html#boost_regex.sub_match.value_type">value_type</a><span class="special">;</span>
+   <span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">difference_type</span>  <a href="sub_match.html#boost_regex.sub_match.diff_type">difference_type</a><span class="special">;</span>
+   <span class="keyword">typedef</span>          <span class="identifier">BidirectionalIterator</span>                                    <a href="sub_match.html#boost_regex.sub_match.it_type">iterator</a><span class="special">;</span>
+
+   <span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.matched">matched</a><span class="special">;</span>
+
+   <span class="identifier">difference_type</span> <a href="sub_match.html#boost_regex.sub_match.length">length</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <a href="sub_match.html#boost_regex.sub_match.cast">operator basic_string&lt;value_type&gt;</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;</span> <a href="sub_match.html#boost_regex.sub_match.str">str</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+
+   <span class="keyword">int</span> <a href="sub_match.html#boost_regex.sub_match.compare1">compare</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">int</span> <a href="sub_match.html#boost_regex.sub_match.compare2">compare</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+   <span class="keyword">int</span> <a href="sub_match.html#boost_regex.sub_match.compare3">compare</a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span> <span class="identifier">s</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+<span class="preprocessor">#ifdef</span> <span class="identifier">BOOST_REGEX_MATCH_EXTRA</span>
+   <span class="keyword">typedef</span> <span class="identifier">implementation</span><span class="special">-</span><span class="keyword">private</span> <a href="sub_match.html#boost_regex.sub_match.cap_seq_type">capture_sequence_type</a><span class="special">;</span>
+   <span class="keyword">const</span> <span class="identifier">capture_sequence_type</span><span class="special">&amp;</span> <a href="sub_match.html#boost_regex.sub_match.captures">captures</a><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+<span class="preprocessor">#endif</span>
+<span class="special">};</span>
+<span class="comment">//
+</span><span class="comment">// comparisons to another sub_match:
+</span><span class="comment">//
+</span><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare1">operator ==</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare2">operator !=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare3">operator &lt;</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare4">operator &lt;=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare5">operator &gt;=</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare6">operator &gt;</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+
+<span class="comment">//
+</span><span class="comment">// comparisons to a basic_string:
+</span><span class="comment">//
+</span><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare7">operator ==</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare8">operator != </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare9">operator &lt;</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare10">operator &gt;</a> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare11">operator &gt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare12">operator &lt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare13">operator == </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare14">operator != </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare15">operator &lt; </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare16">operator &gt; </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare17">operator &gt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare18">operator &lt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+
+<span class="comment">//
+</span><span class="comment">// comparisons to a pointer to a character array:
+</span><span class="comment">//
+</span><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare19">operator == </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare20">operator != </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare21">operator &lt; </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare22">operator &gt; </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare23">operator &gt;= </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare24">operator &lt;= </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare25">operator == </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare26">operator != </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare27">operator &lt; </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare28">operator &gt; </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare29">operator &gt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare30">operator &lt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+
+<span class="comment">//
+</span><span class="comment">// comparisons to a single character:
+</span><span class="comment">//
+</span><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare31">operator == </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare32">operator != </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare33">operator &lt; </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare34">operator &gt; </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare35">operator &gt;= </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare36">operator &lt;= </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare37">operator == </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare38">operator != </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare39">operator &lt; </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare40">operator &gt; </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare41">operator &gt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <a href="sub_match.html#boost_regex.sub_match.op_compare42">operator &lt;= </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+<span class="comment">// 
+</span><span class="comment">// addition operators: 
+</span><span class="comment">//
+</span><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+   <a href="sub_match.html#boost_regex.sub_match.op_add1">operator + </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+   <a href="sub_match.html#boost_regex.sub_match.op_add2">operator + </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <a href="sub_match.html#boost_regex.sub_match.op_add3">operator + </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <a href="sub_match.html#boost_regex.sub_match.op_add4">operator + </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span> <span class="special">*</span> <span class="identifier">s</span><span class="special">);</span>
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <a href="sub_match.html#boost_regex.sub_match.op_add5">operator + </a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <a href="sub_match.html#boost_regex.sub_match.op_add6">operator + </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span> 
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <a href="sub_match.html#boost_regex.sub_match.op_add7">operator + </a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+
+<span class="comment">//
+</span><span class="comment">// stream inserter:
+</span><span class="comment">//
+</span><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span>
+   <a href="sub_match.html#boost_regex.sub_match.op_stream">operator &lt;&lt; </a><span class="special">(</span><span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">os</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+
+<span class="special">}</span> <span class="comment">// namespace boost
+</span></pre>
+<a name="boost_regex.ref.sub_match.description"></a><h4>
+<a name="id514998"></a>
+        <a href="sub_match.html#boost_regex.ref.sub_match.description">Description</a>
+      </h4>
+<a name="boost_regex.ref.sub_match.members"></a><h5>
+<a name="id515023"></a>
+        <a href="sub_match.html#boost_regex.ref.sub_match.members">Members</a>
+      </h5>
+<a name="boost_regex.sub_match.value_type"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="identifier">value_type</span><span class="special">;</span>
+</pre>
+<p>
+        The type pointed to by the iterators.
+      </p>
+<a name="boost_regex.sub_match.diff_type"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="keyword">typename</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">iterator</span><span class="special">&gt;::</span><span class="identifier">difference_type</span> <span class="identifier">difference_type</span><span class="special">;</span>
+</pre>
+<p>
+        A type that represents the difference between two iterators.
+      </p>
+<a name="boost_regex.sub_match.it_type"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="identifier">BidirectionalIterator</span> <span class="identifier">iterator</span><span class="special">;</span>
+</pre>
+<p>
+        The iterator type.
+      </p>
+<a name="boost_regex.sub_match.first"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">iterator</span> <span class="identifier">first</span>
+</pre>
+<p>
+        An iterator denoting the position of the start of the match.
+      </p>
+<a name="boost_regex.sub_match.second"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">iterator</span> <span class="identifier">second</span>
+</pre>
+<p>
+        An iterator denoting the position of the end of the match.
+      </p>
+<a name="boost_regex.sub_match.matched"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">bool</span> <span class="identifier">matched</span>
+</pre>
+<p>
+        A Boolean value denoting whether this sub-expression participated in the
+        match.
+      </p>
+<a name="boost_regex.sub_match.length"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">static</span> <span class="identifier">difference_type</span> <span class="identifier">length</span><span class="special">();</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns the length of this matched
+        sub-expression, or 0 if this sub-expression was not matched: <tt class="computeroutput"><span class="identifier">matched</span> <span class="special">?</span> <span class="identifier">distance</span><span class="special">(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">second</span><span class="special">)</span> <span class="special">:</span> <span class="number">0</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.cast"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">operator</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: converts <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> into a string: returns <tt class="computeroutput"><span class="special">(</span><span class="identifier">matched</span> <span class="special">?</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">second</span><span class="special">)</span> <span class="special">:</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;())</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.str"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;</span> <span class="identifier">str</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns a string representation
+        of <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt>:
+        <tt class="computeroutput"><span class="special">(</span><span class="identifier">matched</span>
+        <span class="special">?</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;(</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">second</span><span class="special">)</span> <span class="special">:</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;())</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.compare1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">int</span> <span class="identifier">compare</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: performs a lexical comparison to
+        <span class="emphasis"><em>s</em></span>: returns <tt class="computeroutput"><span class="identifier">str</span><span class="special">().</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">s</span><span class="special">.</span><span class="identifier">str</span><span class="special">())</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.compare2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">int</span> <span class="identifier">compare</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">value_type</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: compares <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> to the string <span class="emphasis"><em>s</em></span>:
+        returns <tt class="computeroutput"><span class="identifier">str</span><span class="special">().</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.compare3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">int</span> <span class="identifier">compare</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">value_type</span><span class="special">*</span> <span class="identifier">s</span><span class="special">)</span><span class="keyword">const</span><span class="special">;</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: compares <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt> to the null-terminated string <span class="emphasis"><em>s</em></span>:
+        returns <tt class="computeroutput"><span class="identifier">str</span><span class="special">().</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.cap_seq_type"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">typedef</span> <span class="identifier">implementation</span><span class="special">-</span><span class="keyword">private</span> <span class="identifier">capture_sequence_type</span><span class="special">;</span>
+</pre>
+<p>
+        Defines an implementation-specific type that satisfies the requirements of
+        a standard library Sequence (21.1.1 including the optional Table 68 operations),
+        whose value_type is a <tt class="computeroutput"><span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span></tt>. This type happens to be <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> <span class="special">&gt;</span></tt>,
+        but you shouldn't actually rely on that.
+      </p>
+<a name="boost_regex.sub_match.captures"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">const</span> <span class="identifier">capture_sequence_type</span><span class="special">&amp;</span> <span class="identifier">captures</span><span class="special">()</span><span class="keyword">const</span><span class="special">;</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns a sequence containing all
+        the captures obtained for this sub-expression.
+      </p>
+<p>
+        <span class="bold"><b>Preconditions</b></span>: the library must be built
+        and used with BOOST_REGEX_MATCH_EXTRA defined, and you must pass the flag
+        <tt class="computeroutput"><span class="identifier">match_extra</span></tt> to the regex
+        matching functions ( <a href="regex_match.html" title=" regex_match"><tt class="computeroutput"><span class="identifier">regex_match</span></tt></a>, <a href="regex_search.html" title=" regex_search"><tt class="computeroutput"><span class="identifier">regex_search</span></tt></a>, <a href="regex_iterator.html" title=" regex_iterator"><tt class="computeroutput"><span class="identifier">regex_iterator</span></tt></a> or <a href="regex_token_iterator.html" title=" regex_token_iterator"><tt class="computeroutput"><span class="identifier">regex_token_iterator</span></tt></a>) in order for
+        this member #function to be defined and return useful information.
+      </p>
+<p>
+        <span class="bold"><b>Rationale</b></span>: Enabling this feature has several
+        consequences:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          sub_match occupies more memory resulting in complex expressions running
+          out of memory or stack space more quickly during matching.
+        </li>
+<li>
+          The matching algorithms are less efficient at handling some features (independent
+          sub-expressions for example), even when match_extra is not used.
+        </li>
+<li>
+          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.
+        </li>
+</ul></div>
+<a name="boost_regex.ref.sub_match.sub_match_non_member_operators"></a><h5>
+<a name="id516625"></a>
+        <a href="sub_match.html#boost_regex.ref.sub_match.sub_match_non_member_operators">sub_match
+        non-member operators</a>
+      </h5>
+<a name="boost_regex.sub_match.op_compare1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">==</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">!=</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&lt;</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare4"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&lt;=</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare5"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&gt;=</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare6"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">compare</span><span class="special">(</span><span class="identifier">rhs</span><span class="special">)</span>
+        <span class="special">&gt;</span> <span class="number">0</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare7"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                                          <span class="identifier">traits</span><span class="special">,</span>
+                                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">==</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare8"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">!=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare9"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                         <span class="identifier">traits</span><span class="special">,</span> 
+                                         <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&lt;</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare10"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                                         <span class="identifier">traits</span><span class="special">,</span> 
+                                                         <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&gt;</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare11"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&gt;=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare12"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&lt;=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare13"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">==</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare14"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">!=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare15"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&lt;</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare16"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                 <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                         <span class="identifier">traits</span><span class="special">,</span> 
+                                         <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&gt;</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare17"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&gt;=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare18"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span>
+                  <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                          <span class="identifier">traits</span><span class="special">,</span> 
+                                          <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&lt;=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare19"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">==</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare20"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">!=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare21"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&lt;</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare22"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&gt;</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare23"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&gt;=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare24"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&lt;=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare25"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">==</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare26"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">!=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare27"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&lt;</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare28"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&gt;</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare29"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&gt;=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare30"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&lt;=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare31"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">==</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare32"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">!=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare33"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&lt;</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare34"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&gt;</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare35"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&gt;=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare36"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span>
+        <span class="special">&lt;=</span> <span class="identifier">rhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare37"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">==</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">==</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare38"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">!=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">!=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare39"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&lt;</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare40"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&gt;</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare41"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&gt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&gt;=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_compare42"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="keyword">bool</span> <span class="keyword">operator</span> <span class="special">&lt;=</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> 
+                  <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">lhs</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">&lt;=</span> <span class="identifier">rhs</span></tt>.
+      </p>
+<p>
+        The addition operators for <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a> allow you to add a <a href="sub_match.html" title=" sub_match"><tt class="computeroutput"><span class="identifier">sub_match</span></tt></a>
+        to any type to which you can add a <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></tt>
+        and obtain a new string as the result.
+      </p>
+<a name="boost_regex.sub_match.op_add1"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+   <span class="keyword">operator</span> <span class="special">+</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">s</span>
+        <span class="special">+</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_add2"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">,</span> <span class="identifier">Allocator</span><span class="special">&gt;</span>
+   <span class="keyword">operator</span> <span class="special">+</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">,</span> 
+                                       <span class="identifier">traits</span><span class="special">,</span> 
+                                       <span class="identifier">Allocator</span><span class="special">&gt;&amp;</span> <span class="identifier">s</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">+</span> <span class="identifier">s</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_add3"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <span class="keyword">operator</span> <span class="special">+</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">s</span>
+        <span class="special">+</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_add4"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <span class="keyword">operator</span> <span class="special">+</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span> <span class="special">*</span> <span class="identifier">s</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">+</span> <span class="identifier">s</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_add5"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <span class="keyword">operator</span> <span class="special">+</span> <span class="special">(</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> 
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">s</span>
+        <span class="special">+</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_add6"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <span class="keyword">operator</span> <span class="special">+</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">,</span> 
+               <span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span> 
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">+</span> <span class="identifier">s</span></tt>.
+      </p>
+<a name="boost_regex.sub_match.op_add7"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span> 
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">basic_string</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">iterator_traits</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;::</span><span class="identifier">value_type</span><span class="special">&gt;</span> 
+   <span class="keyword">operator</span> <span class="special">+</span> <span class="special">(</span><span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m1</span><span class="special">,</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m2</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="identifier">m1</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span>
+        <span class="special">+</span> <span class="identifier">m2</span><span class="special">.</span><span class="identifier">str</span><span class="special">()</span></tt>.
+      </p>
+<a name="boost_regex.ref.sub_match.stream_inserter"></a><h5>
+<a name="id528696"></a>
+        <a href="sub_match.html#boost_regex.ref.sub_match.stream_inserter">Stream inserter</a>
+      </h5>
+<a name="boost_regex.sub_match.op_stream"></a><p>
+      </p>
+<pre class="programlisting">
+<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">charT</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">traits</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">BidirectionalIterator</span><span class="special">&gt;</span>
+<span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span>
+   <span class="keyword">operator</span> <span class="special">&lt;&lt;</span> <span class="special">(</span><span class="identifier">basic_ostream</span><span class="special">&lt;</span><span class="identifier">charT</span><span class="special">,</span> <span class="identifier">traits</span><span class="special">&gt;&amp;</span> <span class="identifier">os</span>
+               <span class="keyword">const</span> <span class="identifier">sub_match</span><span class="special">&lt;</span><span class="identifier">BidirectionalIterator</span><span class="special">&gt;&amp;</span> <span class="identifier">m</span><span class="special">);</span>
+</pre>
+<p>
+        <span class="bold"><b>Effects</b></span>: returns <tt class="computeroutput"><span class="special">(</span><span class="identifier">os</span> <span class="special">&lt;&lt;</span> <span class="identifier">m</span><span class="special">.</span><span class="identifier">str</span><span class="special">())</span></tt>.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="match_results.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="regex_match.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/ref/syntax_option_type.html b/doc/html/boost_regex/ref/syntax_option_type.html
new file mode 100644
index 00000000..9a4e4ab1
--- /dev/null
+++ b/doc/html/boost_regex/ref/syntax_option_type.html
@@ -0,0 +1,56 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> syntax_option_type</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../ref.html" title=" Reference">
+<link rel="prev" href="bad_expression.html" title=" bad_expression">
+<link rel="next" href="syntax_option_type/syntax_option_type_synopsis.html" title="
+        syntax_option_type Synopsis">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="bad_expression.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type/syntax_option_type_synopsis.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.ref.syntax_option_type"></a><a href="syntax_option_type.html" title=" syntax_option_type"> syntax_option_type</a></h3></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="syntax_option_type/syntax_option_type_synopsis.html">
+        syntax_option_type Synopsis</a></span></dt>
+<dt><span class="section"><a href="syntax_option_type/syntax_option_type_overview.html">
+        Overview of syntax_option_type</a></span></dt>
+<dt><span class="section"><a href="syntax_option_type/syntax_option_type_perl.html">
+        Options for Perl Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="syntax_option_type/syntax_option_type_extended.html">
+        Options for POSIX Extended Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="syntax_option_type/syntax_option_type_basic.html">
+        Options for POSIX Basic Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="syntax_option_type/syntax_option_type_literal.html">
+        Options for Literal Strings</a></span></dt>
+</dl></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="bad_expression.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../ref.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type/syntax_option_type_synopsis.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..6a93eee2
--- /dev/null
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
@@ -0,0 +1,399 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Options for POSIX Basic Regular Expressions</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax_option_type.html" title=" syntax_option_type">
+<link rel="prev" href="syntax_option_type_extended.html" title="
+        Options for POSIX Extended Regular Expressions">
+<link rel="next" href="syntax_option_type_literal.html" title="
+        Options for Literal Strings">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_extended.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_literal.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.syntax_option_type.syntax_option_type_basic"></a><a href="syntax_option_type_basic.html" title="
+        Options for POSIX Basic Regular Expressions">
+        Options for POSIX Basic Regular Expressions</a></h4></div></div></div>
+<p>
+          Exactly one of the following must always be set for POSIX basic regular
+          expressions:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect When Set
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  basic
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the grammar recognized by the regular expression
+                  engine is the same as that used by <a href="../../syntax/basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">POSIX
+                  basic regular expressions</a> in IEEE Std 1003.1-2001, Portable
+                  Operating System Interface (POSIX ), Base Definitions and Headers,
+                  Section 9, Regular Expressions (FWD.1).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  sed
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  As Above.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  grep
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the grammar recognized by the regular expression
+                  engine is the same as that used by POSIX utility <tt class="computeroutput"><span class="identifier">grep</span></tt> in IEEE Std 1003.1-2001,
+                  Portable Operating System Interface (POSIX ), Shells and Utilities,
+                  Section 4, Utilit\ies, grep (FWD.1).
+                </p>
+                <p>
+                  That is to say, the same as <a href="../../syntax/basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">POSIX
+                  basic syntax</a>, but with the newline character acting as an
+                  alternation character; the expression is treated as a newline separated
+                  list of alternatives.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  emacs
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the grammar recognised is the superset of the <a href="../../syntax/basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">POSIX-Basic syntax</a>
+                  used by the emacs program.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+          The following options may also be set when using POSIX basic regular expressions:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect when set
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  icase
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that matching of regular expressions against a character
+                  container sequence shall be performed without regard to case.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  nosubs
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that when a regular expression is matched against a character
+                  container sequence, then no sub-expression matches are to be stored
+                  in the supplied <a href="../match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> structure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  optimize
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the regular expression engine should pay more attention
+                  to the speed with which regular expressions are matched, and less
+                  to the speed with which regular expression objects are constructed.
+                  Otherwise it has no detectable effect on the program output. This
+                  currently has no effect for Boost.Regex.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  collate
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that character ranges of the form <tt class="computeroutput"><span class="special">[</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">b</span><span class="special">]</span></tt>
+                  should be locale sensitive. This bit is on by default for <a href="../../syntax/basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">POSIX-Basic regular expressions</a>,
+                  but can be unset to force ranges to be compared by code point only.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  newline_alt
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the \n character has the same effect as the alternation
+                  operator |. Allows newline separated lists to be used as a list
+                  of alternatives. This bit is already set, if you use the <tt class="computeroutput"><span class="identifier">grep</span></tt> option.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_char_classes
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  When set then character classes such as <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">alnum</span><span class="special">:]]</span></tt>
+                  are not allowed.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_escape_in_lists
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  When set this makes the escape character ordinary inside lists,
+                  so that <tt class="computeroutput"><span class="special">[\</span><span class="identifier">b</span><span class="special">]</span></tt> would match either '\' or 'b'.
+                  This bit is on by default for <a href="../../syntax/basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">POSIX-basic
+                  regular expressions</a>, but can be unset to force escapes to
+                  be recognised inside lists.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_intervals
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  When set then bounded repeats such as a{2,3} are not permitted.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  bk_plus_qm
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  When set then <tt class="computeroutput"><span class="special">\?</span></tt> acts
+                  as a zero-or-one repeat operator, and <tt class="computeroutput"><span class="special">\+</span></tt>
+                  acts as a one-or-more repeat operator.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  bk_vbar
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  When set then <tt class="computeroutput"><span class="special">\|</span></tt> acts
+                  as the alternation operator.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_except
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Prevents <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> from throwing
+                  an exception when an invalid expression is encountered.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_extended.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_literal.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..9c11ca00
--- /dev/null
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
@@ -0,0 +1,353 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Options for POSIX Extended Regular Expressions</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax_option_type.html" title=" syntax_option_type">
+<link rel="prev" href="syntax_option_type_perl.html" title="
+        Options for Perl Regular Expressions">
+<link rel="next" href="syntax_option_type_basic.html" title="
+        Options for POSIX Basic Regular Expressions">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_perl.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_basic.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.syntax_option_type.syntax_option_type_extended"></a><a href="syntax_option_type_extended.html" title="
+        Options for POSIX Extended Regular Expressions">
+        Options for POSIX Extended Regular Expressions</a></h4></div></div></div>
+<p>
+          Exactly one of the following must always be set for <a href="../../syntax/basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax">POSIX
+          extended regular expressions</a>:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect when set
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  extended
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the grammar recognized by the regular expression
+                  engine is the same as that used by POSIX extended regular expressions
+                  in IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX
+                  ), Base Definitions and Headers, Section 9, Regular Expressions
+                  (FWD.1).
+                </p>
+                <p>
+                  Refer to the <a href="../../syntax/basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax">POSIX
+                  extended regular expression guide</a> for more information.
+                </p>
+                <p>
+                  In addition some perl-style escape sequences are supported (The
+                  POSIX standard specifies that only "special" characters
+                  may be escaped, all other escape sequences result in undefined
+                  behavior).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  egrep
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the grammar recognized by the regular expression
+                  engine is the same as that used by POSIX utility grep when given
+                  the -E option in IEEE Std 1003.1-2001, Portable Operating System
+                  Interface (POSIX ), Shells and Utilities, Section 4, Utilities,
+                  grep (FWD.1).
+                </p>
+                <p>
+                  That is to say, the same as <a href="../../syntax/basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax">POSIX
+                  extended syntax</a>, but with the newline character acting as
+                  an alternation character in addition to "|".
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  awk
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the grammar recognized by the regular expression
+                  engine is the same as that used by POSIX utility awk in IEEE Std
+                  1003.1-2001, Portable Operating System Interface (POSIX ), Shells
+                  and Utilities, Section 4, awk (FWD.1).
+                </p>
+                <p>
+                  That is to say: the same as <a href="../../syntax/basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax">POSIX
+                  extended syntax</a>, but with escape sequences in character
+                  classes permitted.
+                </p>
+                <p>
+                  In addition some perl-style escape sequences are supported (actually
+                  the awk syntax only requires \a \b \t \v \f \n and \r to be recognised,
+                  all other Perl-style escape sequences invoke undefined behavior
+                  according to the POSIX standard, but are in fact recognised by
+                  Boost.Regex).
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+          The following options may also be set when using POSIX extended regular
+          expressions:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect when set
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  icase
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that matching of regular expressions against a character
+                  container sequence shall be performed without regard to case.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  nosubs
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that when a regular expression is matched against a character
+                  container sequence, then no sub-expression matches are to be stored
+                  in the supplied <a href="../match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> structure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  optimize
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the regular expression engine should pay more attention
+                  to the speed with which regular expressions are matched, and less
+                  to the speed with which regular expression objects are constructed.
+                  Otherwise it has no detectable effect on the program output. This
+                  currently has no effect for Boost.Regex.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  collate
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that character ranges of the form <tt class="computeroutput"><span class="special">[</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">b</span><span class="special">]</span></tt>
+                  should be locale sensitive. This bit is on by default for POSIX-Extended
+                  regular expressions, but can be unset to force ranges to be compared
+                  by code point only.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  newline_alt
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the \n character has the same effect as the alternation
+                  operator |. Allows newline separated lists to be used as a list
+                  of alternatives.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_escape_in_lists
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  When set this makes the escape character ordinary inside lists,
+                  so that <tt class="computeroutput"><span class="special">[\</span><span class="identifier">b</span><span class="special">]</span></tt> would match either '\' or 'b'.
+                  This bit is on by default for POSIX-Extended regular expressions,
+                  but can be unset to force escapes to be recognised inside lists.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_bk_refs
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  When set then backreferences are disabled. This bit is on by default
+                  for POSIX-Extended regular expressions, but can be unset to support
+                  for backreferences on.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_except
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Prevents <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> from throwing
+                  an exception when an invalid expression is encountered.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_perl.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_basic.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..7e1ad83c
--- /dev/null
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
@@ -0,0 +1,158 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Options for Literal Strings</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax_option_type.html" title=" syntax_option_type">
+<link rel="prev" href="syntax_option_type_basic.html" title="
+        Options for POSIX Basic Regular Expressions">
+<link rel="next" href="../match_flag_type.html" title=" match_flag_type">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_basic.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../match_flag_type.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.syntax_option_type.syntax_option_type_literal"></a><a href="syntax_option_type_literal.html" title="
+        Options for Literal Strings">
+        Options for Literal Strings</a></h4></div></div></div>
+<p>
+          The following must always be set to interpret the expression as a string
+          literal:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect when set
+                </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+                <p>
+                  literal
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Treat the string as a literal (no special characters).
+                </p>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          The following options may also be combined with the literal flag:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect when set
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  icase
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that matching of regular expressions against a character
+                  container sequence shall be performed without regard to case.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  optimize
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the regular expression engine should pay more attention
+                  to the speed with which regular expressions are matched, and less
+                  to the speed with which regular expression objects are constructed.
+                  Otherwise it has no detectable effect on the program output. This
+                  currently has no effect for Boost.Regex.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_basic.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../match_flag_type.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..e8d09cca
--- /dev/null
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
@@ -0,0 +1,79 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Overview of syntax_option_type</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax_option_type.html" title=" syntax_option_type">
+<link rel="prev" href="syntax_option_type_synopsis.html" title="
+        syntax_option_type Synopsis">
+<link rel="next" href="syntax_option_type_perl.html" title="
+        Options for Perl Regular Expressions">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_synopsis.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_perl.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.syntax_option_type.syntax_option_type_overview"></a><a href="syntax_option_type_overview.html" title="
+        Overview of syntax_option_type">
+        Overview of syntax_option_type</a></h4></div></div></div>
+<p>
+          The type <a href="../syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a> is an implementation
+          specific bitmask type (see C++ standard 17.3.2.1.2). Setting its elements
+          has the effects listed in the table below, a valid value of type <a href="../syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a>
+          will always have exactly one of the elements <tt class="computeroutput"><span class="identifier">normal</span></tt>,
+          <tt class="computeroutput"><span class="identifier">basic</span></tt>, <tt class="computeroutput"><span class="identifier">extended</span></tt>,
+          <tt class="computeroutput"><span class="identifier">awk</span></tt>, <tt class="computeroutput"><span class="identifier">grep</span></tt>,
+          <tt class="computeroutput"><span class="identifier">egrep</span></tt>, <tt class="computeroutput"><span class="identifier">sed</span></tt>,
+          <tt class="computeroutput"><span class="identifier">literal</span></tt> or <tt class="computeroutput"><span class="identifier">perl</span></tt> set.
+        </p>
+<p>
+          Note that for convenience all the constants listed here are duplicated
+          within the scope of class template <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>, so you can use any
+          of:
+        </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">constant_name</span>
+</pre>
+<p>
+          or
+        </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">constant_name</span>
+</pre>
+<p>
+          or
+        </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">wregex</span><span class="special">::</span><span class="identifier">constant_name</span>
+</pre>
+<p>
+          in an interchangeable manner.
+        </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_synopsis.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_perl.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..36fea83b
--- /dev/null
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
@@ -0,0 +1,393 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Options for Perl Regular Expressions</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax_option_type.html" title=" syntax_option_type">
+<link rel="prev" href="syntax_option_type_overview.html" title="
+        Overview of syntax_option_type">
+<link rel="next" href="syntax_option_type_extended.html" title="
+        Options for POSIX Extended Regular Expressions">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_overview.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_extended.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.syntax_option_type.syntax_option_type_perl"></a><a href="syntax_option_type_perl.html" title="
+        Options for Perl Regular Expressions">
+        Options for Perl Regular Expressions</a></h4></div></div></div>
+<p>
+          One of the following must always be set for perl regular expressions:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect when set
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  ECMAScript
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the grammar recognized by the regular expression
+                  engine uses its normal semantics: that is the same as that given
+                  in the ECMA-262, ECMAScript Language Specification, Chapter 15
+                  part 10, RegExp (Regular Expression) Objects (FWD.1).
+                </p>
+                <p>
+                  This is functionally identical to the <a href="../../syntax/perl_syntax.html" title=" Perl Regular Expression
+      Syntax">Perl
+                  regular expression syntax</a>.
+                </p>
+                <p>
+                  Boost.Regex also recognizes all of the perl-compatible <tt class="computeroutput"><span class="special">(?...)</span></tt> extensions in this mode.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  perl
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  As above.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  normal
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  As above.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  JavaScript
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  As above.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  JScript
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  As above.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+          The following options may also be set when using perl-style regular expressions:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Element
+                </p>
+                </th>
+<th>
+                <p>
+                  Standardized
+                </p>
+                </th>
+<th>
+                <p>
+                  Effect when set
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  icase
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that matching of regular expressions against a character
+                  container sequence shall be performed without regard to case.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  nosubs
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that when a regular expression is matched against a character
+                  container sequence, then no sub-expression matches are to be stored
+                  in the supplied <a href="../match_results.html" title=" match_results"><tt class="computeroutput"><span class="identifier">match_results</span></tt></a> structure.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  optimize
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the regular expression engine should pay more attention
+                  to the speed with which regular expressions are matched, and less
+                  to the speed with which regular expression objects are constructed.
+                  Otherwise it has no detectable effect on the program output. This
+                  currently has no effect for Boost.Regex.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  collate
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that character ranges of the form <tt class="computeroutput"><span class="special">[</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">b</span><span class="special">]</span></tt>
+                  should be locale sensitive.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  newline_alt
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Specifies that the \n character has the same effect as the alternation
+                  operator |. Allows newline separated lists to be used as a list
+                  of alternatives.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_except
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Prevents <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a> from throwing
+                  an exception when an invalid expression is encountered.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_mod_m
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Normally Boost.Regex behaves as if the Perl m-modifier is on: so
+                  the assertions ^ and $ match after and before embedded newlines
+                  respectively, setting this flags is equivalent to prefixing the
+                  expression with (?-m).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  no_mod_s
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Normally whether Boost.Regex will match "." against a
+                  newline character is determined by the match flag <tt class="computeroutput"><span class="identifier">match_dot_not_newline</span></tt>. Specifying
+                  this flag is equivalent to prefixing the expression with <tt class="computeroutput"><span class="special">(?-</span><span class="identifier">s</span><span class="special">)</span></tt> and therefore causes "."
+                  not to match a newline character regardless of whether <tt class="computeroutput"><span class="identifier">match_not_dot_newline</span></tt> is set
+                  in the match flags.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  mod_s
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Normally whether Boost.Regex will match "." against a
+                  newline character is determined by the match flag <tt class="computeroutput"><span class="identifier">match_dot_not_newline</span></tt>. Specifying
+                  this flag is equivalent to prefixing the expression with <tt class="computeroutput"><span class="special">(?</span><span class="identifier">s</span><span class="special">)</span></tt> and therefore causes "."
+                  to match a newline character regardless of whether <tt class="computeroutput"><span class="identifier">match_not_dot_newline</span></tt> is set
+                  in the match flags.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  mod_x
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Turns on the perl x-modifier: causes unescaped whitespace in the
+                  expression to be ignored.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="syntax_option_type_overview.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_extended.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..40e6d61f
--- /dev/null
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
@@ -0,0 +1,78 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        syntax_option_type Synopsis</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax_option_type.html" title=" syntax_option_type">
+<link rel="prev" href="../syntax_option_type.html" title=" syntax_option_type">
+<link rel="next" href="syntax_option_type_overview.html" title="
+        Overview of syntax_option_type">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_overview.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.ref.syntax_option_type.syntax_option_type_synopsis"></a><a href="syntax_option_type_synopsis.html" title="
+        syntax_option_type Synopsis">
+        syntax_option_type Synopsis</a></h4></div></div></div>
+<p>
+          Type <a href="../syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a>
+          is an implementation specific bitmask type that controls how a regular
+          expression string is to be interpreted. For convenience note that all the
+          constants listed here, are also duplicated within the scope of class template
+          <a href="../basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>.
+        </p>
+<pre class="programlisting">
+<span class="keyword">namespace</span> <span class="identifier">std</span><span class="special">{</span> <span class="keyword">namespace</span> <span class="identifier">regex_constants</span><span class="special">{</span>
+
+<span class="keyword">typedef</span> <span class="identifier">implementation</span><span class="special">-</span><span class="identifier">specific</span><span class="special">-</span><span class="identifier">bitmask</span><span class="special">-</span><span class="identifier">type</span> <span class="identifier">syntax_option_type</span><span class="special">;</span>
+
+<span class="comment">// these flags are standardized:
+</span><span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">ECMAScript</span> <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">JavaScript</span> <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">JScript</span> <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">perl</span> <span class="special">=</span> <span class="identifier">normal</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">basic</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">sed</span> <span class="special">=</span> <span class="identifier">basic</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">extended</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">awk</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">grep</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">egrep</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">icase</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">nosubs</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">optimize</span><span class="special">;</span>
+<span class="keyword">static</span> <span class="keyword">const</span> <span class="identifier">syntax_option_type</span> <span class="identifier">collate</span><span class="special">;</span>
+<span class="comment">// other Boost.Regex specific options are listed below
+</span>
+<span class="special">}</span> <span class="comment">// namespace regex_constants
+</span><span class="special">}</span> <span class="comment">// namespace std
+</span></pre>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax_option_type.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax_option_type_overview.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax.html b/doc/html/boost_regex/syntax.html
new file mode 100644
index 00000000..df1cc1bc
--- /dev/null
+++ b/doc/html/boost_regex/syntax.html
@@ -0,0 +1,110 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Regular Expression Syntax</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="partial_matches.html" title=" Partial Matches">
+<link rel="next" href="syntax/perl_syntax.html" title=" Perl Regular Expression
+      Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="partial_matches.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax/perl_syntax.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.syntax"></a><a href="syntax.html" title=" Regular Expression Syntax"> Regular Expression Syntax</a></h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="syntax/perl_syntax.html"> Perl Regular Expression
+      Syntax</a></span></dt>
+<dt><span class="section"><a href="syntax/basic_extended.html"> POSIX Extended Regular
+      Expression Syntax</a></span></dt>
+<dt><span class="section"><a href="syntax/basic_syntax.html"> POSIX Basic Regular
+      Expression Syntax</a></span></dt>
+<dt><span class="section"><a href="syntax/character_classes.html"> Character Class
+      Names</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="syntax/character_classes/std_char_clases.html">
+        Character Classes that are Always Supported</a></span></dt>
+<dt><span class="section"><a href="syntax/character_classes/optional_char_class_names.html">
+        Character classes that are supported by Unicode Regular Expressions</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="syntax/collating_names.html"> Collating Names</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="syntax/collating_names/digraphs.html"> Digraphs</a></span></dt>
+<dt><span class="section"><a href="syntax/collating_names/posix_symbolic_names.html">
+        POSIX Symbolic Names</a></span></dt>
+<dt><span class="section"><a href="syntax/collating_names/named_unicode.html">
+        Named Unicode Characters</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="syntax/leftmost_longest_rule.html"> The Leftmost
+      Longest Rule</a></span></dt>
+</dl></div>
+<p>
+      This section covers the regular expression syntax used by this library, this
+      is a programmers guide, the actual syntax presented to your program's users
+      will depend upon the flags used during expression compilation.
+    </p>
+<p>
+      There are three main syntax options available, depending upon how you construct
+      the regular expression object:
+    </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+<a href="syntax/perl_syntax.html" title=" Perl Regular Expression
+      Syntax">Perl (this is the default
+        behavior)</a>.
+      </li>
+<li>
+<a href="syntax/basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax">POSIX extended (including
+        the egrep and awk variations)</a>.
+      </li>
+<li>
+<a href="syntax/basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">POSIX Basic (including the
+        grep and emacs variations)</a>.
+      </li>
+</ul></div>
+<p>
+      You can also construct a regular expression that treats every character as
+      a literal, but that's not really a "syntax"!
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+<p>
+    </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="partial_matches.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax/perl_syntax.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/basic_extended.html b/doc/html/boost_regex/syntax/basic_extended.html
new file mode 100644
index 00000000..ba068602
--- /dev/null
+++ b/doc/html/boost_regex/syntax/basic_extended.html
@@ -0,0 +1,1214 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> POSIX Extended Regular
+      Expression Syntax</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax.html" title=" Regular Expression Syntax">
+<link rel="prev" href="perl_syntax.html" title=" Perl Regular Expression
+      Syntax">
+<link rel="next" href="basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="perl_syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="basic_syntax.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.syntax.basic_extended"></a><a href="basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax"> POSIX Extended Regular
+      Expression Syntax</a></h3></div></div></div>
+<a name="boost_regex.syntax.basic_extended.synopsis"></a><h3>
+<a name="id470414"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.synopsis">Synopsis</a>
+      </h3>
+<p>
+        The POSIX-Extended regular expression syntax is supported by the POSIX C
+        regular expression API's, and variations are used by the utilities <tt class="computeroutput"><span class="identifier">egrep</span></tt> and <tt class="computeroutput"><span class="identifier">awk</span></tt>.
+        You can construct POSIX extended regular expressions in Boost.Regex by passing
+        the flag <tt class="computeroutput"><span class="identifier">extended</span></tt> to the
+        regex constructor, for example:
+      </p>
+<pre class="programlisting">
+<span class="comment">// e1 is a case sensitive POSIX-Extended expression:
+</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e1</span><span class="special">(</span><span class="identifier">my_expression</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">extended</span><span class="special">);</span>
+<span class="comment">// e2 a case insensitive POSIX-Extended expression:
+</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e2</span><span class="special">(</span><span class="identifier">my_expression</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">extended</span><span class="special">|</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">icase</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.posix_extended_syntax"></a><p>
+      </p>
+<a name="boost_regex.syntax.basic_extended.posix_extended_syntax"></a><h3>
+<a name="id470682"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.posix_extended_syntax">POSIX
+        Extended Syntax</a>
+      </h3>
+<p>
+        In POSIX-Extended regular expressions, all characters match themselves except
+        for the following special characters:
+      </p>
+<pre class="programlisting">.[{()\*+?|^$</pre>
+<a name="boost_regex.syntax.basic_extended.wildcard_"></a><h4>
+<a name="id470723"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.wildcard_">Wildcard:</a>
+      </h4>
+<p>
+        The single character '.' when used outside of a character set will match
+        any single character except:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          The NULL character when the flag <tt class="computeroutput"><span class="identifier">match_no_dot_null</span></tt>
+          is passed to the matching algorithms.
+        </li>
+<li>
+          The newline character when the flag <tt class="computeroutput"><span class="identifier">match_not_dot_newline</span></tt>
+          is passed to the matching algorithms.
+        </li>
+</ul></div>
+<a name="boost_regex.syntax.basic_extended.anchors_"></a><h4>
+<a name="id470793"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.anchors_">Anchors:</a>
+      </h4>
+<p>
+        A '^' character shall match the start of a line when used as the first character
+        of an expression, or the first character of a sub-expression.
+      </p>
+<p>
+        A '$' character shall match the end of a line when used as the last character
+        of an expression, or the last character of a sub-expression.
+      </p>
+<a name="boost_regex.syntax.basic_extended.marked_sub_expressions_"></a><h4>
+<a name="id470830"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.marked_sub_expressions_">Marked
+        sub-expressions:</a>
+      </h4>
+<p>
+        A section beginning <tt class="computeroutput"><span class="special">(</span></tt> and ending
+        <tt class="computeroutput"><span class="special">)</span></tt> acts as a marked sub-expression.
+        Whatever matched the sub-expression is split out in a separate field by the
+        matching algorithms. Marked sub-expressions can also repeated, or referred
+        to by a back-reference.
+      </p>
+<a name="boost_regex.syntax.basic_extended.repeats_"></a><h4>
+<a name="id470888"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.repeats_">Repeats:</a>
+      </h4>
+<p>
+        Any atom (a single character, a marked sub-expression, or a character class)
+        can be repeated with the <tt class="computeroutput"><span class="special">*</span></tt>,
+        <tt class="computeroutput"><span class="special">+</span></tt>, <tt class="computeroutput"><span class="special">?</span></tt>,
+        and <tt class="computeroutput"><span class="special">{}</span></tt> operators.
+      </p>
+<p>
+        The <tt class="computeroutput"><span class="special">*</span></tt> operator will match the
+        preceding atom <span class="emphasis"><em>zero or more times</em></span>, for example the expression
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">*</span><span class="identifier">b</span></tt> will match any of the following:
+      </p>
+<pre class="programlisting">b
+ab
+aaaaaaaab
+</pre>
+<p>
+        The <tt class="computeroutput"><span class="special">+</span></tt> operator will match the
+        preceding atom <span class="emphasis"><em>one or more times</em></span>, for example the expression
+        a+b will match any of the following:
+      </p>
+<pre class="programlisting">ab
+aaaaaaaab
+</pre>
+<p>
+        But will not match:
+      </p>
+<pre class="programlisting">b
+</pre>
+<p>
+        The <tt class="computeroutput"><span class="special">?</span></tt> operator will match the
+        preceding atom <span class="emphasis"><em>zero or one times</em></span>, for example the expression
+        <tt class="computeroutput"><span class="identifier">ca</span><span class="special">?</span><span class="identifier">b</span></tt> will match any of the following:
+      </p>
+<pre class="programlisting">cb
+cab
+</pre>
+<p>
+        But will not match:
+      </p>
+<pre class="programlisting">caab
+</pre>
+<p>
+        An atom can also be repeated with a bounded repeat:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">{</span><span class="identifier">n</span><span class="special">}</span></tt> Matches
+        'a' repeated <span class="emphasis"><em>exactly n times</em></span>.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">{</span><span class="identifier">n</span><span class="special">,}</span></tt> Matches
+        'a' repeated <span class="emphasis"><em>n or more times</em></span>.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">{</span><span class="identifier">n</span><span class="special">,</span> <span class="identifier">m</span><span class="special">}</span></tt> Matches 'a' repeated <span class="emphasis"><em>between n
+        and m times inclusive</em></span>.
+      </p>
+<p>
+        For example:
+      </p>
+<pre class="programlisting">^a{2,3}$</pre>
+<p>
+        Will match either of:
+      </p>
+<pre class="programlisting">
+<span class="identifier">aa</span>
+<span class="identifier">aaa</span>
+</pre>
+<p>
+        But neither of:
+      </p>
+<pre class="programlisting">
+<span class="identifier">a</span>
+<span class="identifier">aaaa</span>
+</pre>
+<p>
+        It is an error to use a repeat operator, if the preceding construct can not
+        be repeated, for example:
+      </p>
+<pre class="programlisting">
+<span class="identifier">a</span><span class="special">(*)</span>
+</pre>
+<p>
+        Will raise an error, as there is nothing for the <tt class="computeroutput"><span class="special">*</span></tt>
+        operator to be applied to.
+      </p>
+<a name="boost_regex.syntax.basic_extended.back_references_"></a><h4>
+<a name="id471342"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.back_references_">Back references:</a>
+      </h4>
+<p>
+        An escape character followed by a digit <span class="emphasis"><em>n</em></span>, where <span class="emphasis"><em>n</em></span>
+        is in the range 1-9, matches the same string that was matched by sub-expression
+        <span class="emphasis"><em>n</em></span>. For example the expression:
+      </p>
+<pre class="programlisting">^(a*).*\1$</pre>
+<p>
+        Will match the string:
+      </p>
+<pre class="programlisting">
+<span class="identifier">aaabbaaa</span>
+</pre>
+<p>
+        But not the string:
+      </p>
+<pre class="programlisting">
+<span class="identifier">aaabba</span>
+</pre>
+<div class="caution"><table border="0" summary="Caution">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../doc/html/images/caution.png"></td>
+<th align="left">Caution</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          The POSIX standard does not support back-references for "extended"
+          regular expressions, this is a compatible extension to that standard.
+        </p></td></tr>
+</table></div>
+<a name="boost_regex.syntax.basic_extended.alternation"></a><h4>
+<a name="id471440"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.alternation">Alternation</a>
+      </h4>
+<p>
+        The <tt class="computeroutput"><span class="special">|</span></tt> operator will match either
+        of its arguments, so for example: <tt class="computeroutput"><span class="identifier">abc</span><span class="special">|</span><span class="identifier">def</span></tt> will
+        match either "abc" or "def".
+      </p>
+<p>
+        Parenthesis can be used to group alternations, for example: <tt class="computeroutput"><span class="identifier">ab</span><span class="special">(</span><span class="identifier">d</span><span class="special">|</span><span class="identifier">ef</span><span class="special">)</span></tt>
+        will match either of "abd" or "abef".
+      </p>
+<a name="boost_regex.syntax.basic_extended.character_sets_"></a><h4>
+<a name="id471545"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.character_sets_">Character
+        sets:</a>
+      </h4>
+<p>
+        A character set is a bracket-expression starting with [ and ending with ],
+        it defines a set of characters, and matches any single character that is
+        a member of that set.
+      </p>
+<p>
+        A bracket expression may contain any combination of the following:
+      </p>
+<a name="boost_regex.syntax.basic_extended.single_characters_"></a><h5>
+<a name="id471583"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.single_characters_">Single
+        characters:</a>
+      </h5>
+<p>
+        For example <tt class="computeroutput"><span class="special">[</span><span class="identifier">abc</span><span class="special">]</span></tt>, will match any of the characters 'a', 'b',
+        or 'c'.
+      </p>
+<a name="boost_regex.syntax.basic_extended.character_ranges_"></a><h5>
+<a name="id471636"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.character_ranges_">Character
+        ranges:</a>
+      </h5>
+<p>
+        For example <tt class="computeroutput"><span class="special">[</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">]</span></tt>
+        will match any single character in the range 'a' to 'c'. By default, for
+        POSIX-Extended regular expressions, a character <span class="emphasis"><em>x</em></span> is
+        within the range <span class="emphasis"><em>y</em></span> to <span class="emphasis"><em>z</em></span>, if it
+        collates within that range; this results in locale specific behavior . This
+        behavior can be turned off by unsetting the <tt class="computeroutput"><span class="identifier">collate</span></tt>
+        <a href="../ref/syntax_option_type.html" title=" syntax_option_type">option flag</a> - in
+        which case whether a character appears within a range is determined by comparing
+        the code points of the characters only.
+      </p>
+<a name="boost_regex.syntax.basic_extended.negation_"></a><h5>
+<a name="id471737"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.negation_">Negation:</a>
+      </h5>
+<p>
+        If the bracket-expression begins with the ^ character, then it matches the
+        complement of the characters it contains, for example <tt class="computeroutput"><span class="special">[^</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">]</span></tt> matches any character that is not in the
+        range <tt class="computeroutput"><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span></tt>.
+      </p>
+<a name="boost_regex.syntax.basic_extended.character_classes_"></a><h5>
+<a name="id471821"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.character_classes_">Character
+        classes:</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">name</span><span class="special">:]]</span></tt>
+        matches the named character class "name", for example <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">lower</span><span class="special">:]]</span></tt> matches any lower case character. See
+        <a href="character_classes.html" title=" Character Class
+      Names">character class names</a>.
+      </p>
+<a name="boost_regex.syntax.basic_extended.collating_elements_"></a><h5>
+<a name="id471905"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.collating_elements_">Collating
+        Elements:</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[.</span><span class="identifier">col</span><span class="special">.]</span></tt> matches
+        the collating element <span class="emphasis"><em>col</em></span>. A collating element is any
+        single character, or any sequence of characters that collates as a single
+        unit. Collating elements may also be used as the end point of a range, for
+        example: <tt class="computeroutput"><span class="special">[[.</span><span class="identifier">ae</span><span class="special">.]-</span><span class="identifier">c</span><span class="special">]</span></tt>
+        matches the character sequence "ae", plus any single character
+        in the range "ae"-c, assuming that "ae" is treated as
+        a single collating element in the current locale.
+      </p>
+<p>
+        Collating elements may be used in place of escapes (which are not normally
+        allowed inside character sets), for example <tt class="computeroutput"><span class="special">[[.^.]</span><span class="identifier">abc</span><span class="special">]</span></tt> would
+        match either one of the characters 'abc^'.
+      </p>
+<p>
+        As an extension, a collating element may also be specified via its <a href="collating_names.html" title=" Collating Names">symbolic name</a>, for example:
+      </p>
+<pre class="programlisting">
+<span class="special">[[.</span><span class="identifier">NUL</span><span class="special">.]]</span>
+</pre>
+<p>
+        matches a NUL character.
+      </p>
+<a name="boost_regex.syntax.basic_extended.equivalence_classes_"></a><h5>
+<a name="id472066"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.equivalence_classes_">Equivalence
+        classes:</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[=</span><span class="identifier">col</span><span class="special">=]]</span></tt>,
+        matches any character or collating element whose primary sort key is the
+        same as that for collating element <span class="emphasis"><em>col</em></span>, as with colating
+        elements the name <span class="emphasis"><em>col</em></span> may be a <a href="collating_names.html" title=" Collating Names">symbolic
+        name</a>. A primary sort key is one that ignores case, accentation, or
+        locale-specific tailorings; so for example <tt class="computeroutput"><span class="special">[[=</span><span class="identifier">a</span><span class="special">=]]</span></tt> matches
+        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
+        of this is reliant on the platform's collation and localisation support;
+        this feature can not be relied upon to work portably across all platforms,
+        or even all locales on one platform.
+      </p>
+<a name="boost_regex.syntax.basic_extended.combinations_"></a><h5>
+<a name="id472176"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.combinations_">Combinations:</a>
+      </h5>
+<p>
+        All of the above can be combined in one character set declaration, for example:
+        <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">digit</span><span class="special">:]</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">[.</span><span class="identifier">NUL</span><span class="special">.]]</span></tt>.
+      </p>
+<a name="boost_regex.syntax.basic_extended.escapes"></a><h4>
+<a name="id472256"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.escapes">Escapes</a>
+      </h4>
+<p>
+        The POSIX standard defines no escape sequences for POSIX-Extended regular
+        expressions, except that:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          Any special character preceded by an escape shall match itself.
+        </li>
+<li>
+          The effect of any ordinary character being preceded by an escape is undefined.
+        </li>
+<li>
+          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 <tt class="computeroutput"><span class="special">[\^]</span></tt>
+          will match either a literal '\' or a '^'.
+        </li>
+</ul></div>
+<p>
+        However, that's rather restrictive, so the following standard-compatible
+        extensions are also supported by Boost.Regex:
+      </p>
+<a name="boost_regex.syntax.basic_extended.escapes_matching_a_specific_character"></a><h5>
+<a name="id472326"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.escapes_matching_a_specific_character">Escapes
+        matching a specific character</a>
+      </h5>
+<p>
+        The following escape sequences are all synonyms for single characters:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Character
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                \a
+              </p>
+              </td>
+<td>
+              <p>
+                '\a'
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \e
+              </p>
+              </td>
+<td>
+              <p>
+                0x1B
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \f
+              </p>
+              </td>
+<td>
+              <p>
+                \f
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \n
+              </p>
+              </td>
+<td>
+              <p>
+                \n
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \r
+              </p>
+              </td>
+<td>
+              <p>
+                \r
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \t
+              </p>
+              </td>
+<td>
+              <p>
+                \t
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \v
+              </p>
+              </td>
+<td>
+              <p>
+                \v
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \b
+              </p>
+              </td>
+<td>
+              <p>
+                \b (but only inside a character class declaration).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \cX
+              </p>
+              </td>
+<td>
+              <p>
+                An ASCII escape sequence - the character whose code point is X %
+                32
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \xdd
+              </p>
+              </td>
+<td>
+              <p>
+                A hexadecimal escape sequence - matches the single character whose
+                code point is 0xdd.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \x{dddd}
+              </p>
+              </td>
+<td>
+              <p>
+                A hexadecimal escape sequence - matches the single character whose
+                code point is 0xdddd.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \0ddd
+              </p>
+              </td>
+<td>
+              <p>
+                An octal escape sequence - matches the single character whose code
+                point is 0ddd.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \N{Name}
+              </p>
+              </td>
+<td>
+              <p>
+                Matches the single character which has the symbolic name name. For
+                example <tt class="computeroutput"><span class="special">\\</span><span class="identifier">N</span><span class="special">{</span><span class="identifier">newline</span><span class="special">}</span></tt> matches the single character \n.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.basic_extended._quot_single_character_quot__character_classes_"></a><h5>
+<a name="id472676"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended._quot_single_character_quot__character_classes_">"Single
+        character" character classes:</a>
+      </h5>
+<p>
+        Any escaped character <span class="emphasis"><em>x</em></span>, if <span class="emphasis"><em>x</em></span> is
+        the name of a character class shall match any character that is a member
+        of that class, and any escaped character <span class="emphasis"><em>X</em></span>, if <span class="emphasis"><em>x</em></span>
+        is the name of a character class, shall match any character not in that class.
+      </p>
+<p>
+        The following are supported by default:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape sequence
+              </p>
+              </th>
+<th>
+              <p>
+                Equivalent to
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">d</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">digit</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">l</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">lower</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">s</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">space</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">u</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">upper</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">w</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">word</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">D</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">digit</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">L</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">lower</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">S</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">space</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">U</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">upper</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">W</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">word</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.basic_extended.character_properties"></a><h5>
+<a name="id473310"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.character_properties">Character
+        Properties</a>
+      </h5>
+<p>
+        The character property names in the following table are all equivalent to
+        the names used in character classes.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Form
+              </p>
+              </th>
+<th>
+              <p>
+                Description
+              </p>
+              </th>
+<th>
+              <p>
+                Equivalent character set form
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">pX</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that has the property X.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">X</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">p</span><span class="special">{</span><span class="identifier">Name</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that has the property Name.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">Name</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">PX</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that does not have the property X.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">X</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">P</span><span class="special">{</span><span class="identifier">Name</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that does not have the property Name.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">Name</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        For example <tt class="computeroutput"><span class="special">\</span><span class="identifier">pd</span></tt>
+        matches any "digit" character, as does <tt class="computeroutput"><span class="special">\</span><span class="identifier">p</span><span class="special">{</span><span class="identifier">digit</span><span class="special">}</span></tt>.
+      </p>
+<a name="boost_regex.syntax.basic_extended.word_boundaries"></a><h5>
+<a name="id473712"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.word_boundaries">Word Boundaries</a>
+      </h5>
+<p>
+        The following escape sequences match the boundaries of words:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\&lt;</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches the start of a word.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\&gt;</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches the end of a word.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">b</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches a word boundary (the start or end of a word).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">B</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches only when not at a word boundary.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.basic_extended.buffer_boundaries"></a><h5>
+<a name="id473908"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.buffer_boundaries">Buffer
+        boundaries</a>
+      </h5>
+<p>
+        The following match only at buffer boundaries: a "buffer" in this
+        context is the whole of the input text that is being matched against (note
+        that ^ and $ may match embedded newlines within the text).
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                \`
+              </p>
+              </td>
+<td>
+              <p>
+                Matches at the start of a buffer only.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \'
+              </p>
+              </td>
+<td>
+              <p>
+                Matches at the end of a buffer only.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">A</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches at the start of a buffer only (the same as \`).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">z</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches at the end of a buffer only (the same as \').
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">Z</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches an optional sequence of newlines at the end of a buffer:
+                equivalent to the regular expression <tt class="computeroutput"><span class="special">\</span><span class="identifier">n</span><span class="special">*\</span><span class="identifier">z</span></tt>
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.basic_extended.continuation_escape"></a><h5>
+<a name="id474144"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.continuation_escape">Continuation
+        Escape</a>
+      </h5>
+<p>
+        The sequence <tt class="computeroutput"><span class="special">\</span><span class="identifier">G</span></tt>
+        matches only at the end of the last match found, or at the start of the text
+        being matched if no previous match was found. This escape useful if you're
+        iterating over the matches contained within a text, and you want each subsequence
+        match to start where the last one ended.
+      </p>
+<a name="boost_regex.syntax.basic_extended.quoting_escape"></a><h5>
+<a name="id474196"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.quoting_escape">Quoting
+        escape</a>
+      </h5>
+<p>
+        The escape sequence <tt class="computeroutput"><span class="special">\</span><span class="identifier">Q</span></tt>
+        begins a "quoted sequence": all the subsequent characters are treated
+        as literals, until either the end of the regular expression or <tt class="computeroutput"><span class="special">\</span><span class="identifier">E</span></tt> is found.
+        For example the expression: <tt class="computeroutput"><span class="special">\</span><span class="identifier">Q</span><span class="special">\*+\</span><span class="identifier">Ea</span><span class="special">+</span></tt> would match either of:
+      </p>
+<pre class="programlisting">
+<span class="special">\*+</span><span class="identifier">a</span>
+<span class="special">\*+</span><span class="identifier">aaa</span>
+</pre>
+<a name="boost_regex.syntax.basic_extended.unicode_escapes"></a><h5>
+<a name="id474322"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.unicode_escapes">Unicode
+        escapes</a>
+      </h5>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Meaning
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">C</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches a single code point: in Boost regex this has exactly the
+                same effect as a "." operator.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">X</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches a combining character sequence: that is any non-combining
+                character followed by a sequence of zero or more combining characters.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.basic_extended.any_other_escape"></a><h5>
+<a name="id474456"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.any_other_escape">Any other
+        escape</a>
+      </h5>
+<p>
+        Any other escape sequence matches the character that is escaped, for example
+        \@ matches a literal '@'.
+      </p>
+<a name="boost_regex.syntax.basic_extended.operator_precedence"></a><h4>
+<a name="id474488"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.operator_precedence">Operator
+        precedence</a>
+      </h4>
+<p>
+        The order of precedence for of operators is as follows:
+      </p>
+<div class="orderedlist"><ol type="1">
+<li>
+          Collation-related bracket symbols <tt class="computeroutput"><span class="special">[==]</span>
+          <span class="special">[::]</span> <span class="special">[..]</span></tt>
+</li>
+<li>
+          Escaped characters <tt class="computeroutput"><span class="special">\</span></tt>
+</li>
+<li>
+          Character set (bracket expression) <tt class="computeroutput"><span class="special">[]</span></tt>
+</li>
+<li>
+          Grouping <tt class="computeroutput"><span class="special">()</span></tt>
+</li>
+<li>
+          Single-character-ERE duplication <tt class="computeroutput"><span class="special">*</span>
+          <span class="special">+</span> <span class="special">?</span> <span class="special">{</span><span class="identifier">m</span><span class="special">,</span><span class="identifier">n</span><span class="special">}</span></tt>
+</li>
+<li>
+          Concatenation
+        </li>
+<li>
+          Anchoring ^$
+        </li>
+<li>
+          Alternation <tt class="computeroutput"><span class="special">|</span></tt>
+</li>
+</ol></div>
+<a name="boost_regex.syntax.basic_extended.what_gets_matched"></a><h4>
+<a name="id474680"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.what_gets_matched">What
+        Gets Matched</a>
+      </h4>
+<p>
+        When there is more that one way to match a regular expression, the "best"
+        possible match is obtained using the <a href="leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule">leftmost-longest
+        rule</a>.
+      </p>
+<a name="boost_regex.syntax.basic_extended.variations"></a><h3>
+<a name="id474721"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.variations">Variations</a>
+      </h3>
+<a name="boost_regex.syntax.basic_extended.egrep"></a><h4>
+<a name="id474744"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.egrep">Egrep</a>
+      </h4>
+<p>
+        When an expression is compiled with the <a href="../ref/syntax_option_type.html" title=" syntax_option_type">flag
+        <tt class="computeroutput"><span class="identifier">egrep</span></tt></a> set, then the
+        expression is treated as a newline separated list of <a href="basic_extended.html#boost_regex.posix_extended_syntax">POSIX-Extended
+        expressions</a>, a match is found if any of the expressions in the list
+        match, for example:
+      </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"abc\ndef"</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">egrep</span><span class="special">);</span>
+</pre>
+<p>
+        will match either of the POSIX-Basic expressions "abc" or "def".
+      </p>
+<p>
+        As its name suggests, this behavior is consistent with the Unix utility
+        <tt class="computeroutput"><span class="identifier">egrep</span></tt>, and with grep when
+        used with the -E option.
+      </p>
+<a name="boost_regex.syntax.basic_extended.awk"></a><h4>
+<a name="id474906"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.awk">awk</a>
+      </h4>
+<p>
+        In addition to the <a href="basic_extended.html#boost_regex.posix_extended_syntax">POSIX-Extended
+        features</a> the escape character is special inside a character class
+        declaration.
+      </p>
+<p>
+        In addition, some escape sequences that are not defined as part of POSIX-Extended
+        specification are required to be supported - however Boost.Regex supports
+        these by default anyway.
+      </p>
+<a name="boost_regex.syntax.basic_extended.options"></a><h3>
+<a name="id474953"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.options">Options</a>
+      </h3>
+<p>
+        There are a <a href="../ref/syntax_option_type/syntax_option_type_extended.html" title="
+        Options for POSIX Extended Regular Expressions">variety
+        of flags</a> that may be combined with the <tt class="computeroutput"><span class="identifier">extended</span></tt>
+        and <tt class="computeroutput"><span class="identifier">egrep</span></tt> options when constructing
+        the regular expression, in particular note that the <a href="../ref/syntax_option_type/syntax_option_type_extended.html" title="
+        Options for POSIX Extended Regular Expressions"><tt class="computeroutput"><span class="identifier">newline_alt</span></tt></a> option alters the syntax,
+        while the <a href="../ref/syntax_option_type/syntax_option_type_extended.html" title="
+        Options for POSIX Extended Regular Expressions"><tt class="computeroutput"><span class="identifier">collate</span></tt>, <tt class="computeroutput"><span class="identifier">nosubs</span></tt>
+        and <tt class="computeroutput"><span class="identifier">icase</span></tt> options</a>
+        modify how the case and locale sensitivity are to be applied.
+      </p>
+<a name="boost_regex.syntax.basic_extended.references"></a><h3>
+<a name="id475084"></a>
+        <a href="basic_extended.html#boost_regex.syntax.basic_extended.references">References</a>
+      </h3>
+<p>
+        <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html" target="_top">IEEE
+        Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions
+        and Headers, Section 9, Regular Expressions.</a>
+      </p>
+<p>
+        <a href="http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html" target="_top">IEEE
+        Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and
+        Utilities, Section 4, Utilities, egrep.</a>
+      </p>
+<p>
+        <a href="http://www.opengroup.org/onlinepubs/000095399/utilities/awk.html" target="_top">IEEE
+        Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and
+        Utilities, Section 4, Utilities, awk.</a>
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="perl_syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="basic_syntax.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/basic_syntax.html b/doc/html/boost_regex/syntax/basic_syntax.html
new file mode 100644
index 00000000..2e1fbf33
--- /dev/null
+++ b/doc/html/boost_regex/syntax/basic_syntax.html
@@ -0,0 +1,670 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> POSIX Basic Regular
+      Expression Syntax</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax.html" title=" Regular Expression Syntax">
+<link rel="prev" href="basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax">
+<link rel="next" href="character_classes.html" title=" Character Class
+      Names">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="basic_extended.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="character_classes.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.syntax.basic_syntax"></a><a href="basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax"> POSIX Basic Regular
+      Expression Syntax</a></h3></div></div></div>
+<a name="boost_regex.syntax.basic_syntax.synopsis"></a><h3>
+<a name="id475172"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.synopsis">Synopsis</a>
+      </h3>
+<p>
+        The POSIX-Basic regular expression syntax is used by the Unix utility <tt class="computeroutput"><span class="identifier">sed</span></tt>, and variations are used by <tt class="computeroutput"><span class="identifier">grep</span></tt> and <tt class="computeroutput"><span class="identifier">emacs</span></tt>.
+        You can construct POSIX basic regular expressions in Boost.Regex by passing
+        the flag <tt class="computeroutput"><span class="identifier">basic</span></tt> to the regex
+        constructor (see <a href="../ref/syntax_option_type.html" title=" syntax_option_type"><tt class="computeroutput"><span class="identifier">syntax_option_type</span></tt></a>), for example:
+      </p>
+<pre class="programlisting">
+<span class="comment">// e1 is a case sensitive POSIX-Basic expression:
+</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e1</span><span class="special">(</span><span class="identifier">my_expression</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">basic</span><span class="special">);</span>
+<span class="comment">// e2 a case insensitive POSIX-Basic expression:
+</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e2</span><span class="special">(</span><span class="identifier">my_expression</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">basic</span><span class="special">|</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">icase</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.posix_basic"></a><p>
+      </p>
+<a name="boost_regex.syntax.basic_syntax.posix_basic_syntax"></a><h3>
+<a name="id475467"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.posix_basic_syntax">POSIX
+        Basic Syntax</a>
+      </h3>
+<p>
+        In POSIX-Basic regular expressions, all characters are match themselves except
+        for the following special characters:
+      </p>
+<pre class="programlisting">.[\*^$</pre>
+<a name="boost_regex.syntax.basic_syntax.wildcard_"></a><h4>
+<a name="id475508"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.wildcard_">Wildcard:</a>
+      </h4>
+<p>
+        The single character '.' when used outside of a character set will match
+        any single character except:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          The NULL character when the flag <tt class="computeroutput"><span class="identifier">match_no_dot_null</span></tt>
+          is passed to the matching algorithms.
+        </li>
+<li>
+          The newline character when the flag <tt class="computeroutput"><span class="identifier">match_not_dot_newline</span></tt>
+          is passed to the matching algorithms.
+        </li>
+</ul></div>
+<a name="boost_regex.syntax.basic_syntax.anchors_"></a><h4>
+<a name="id475578"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.anchors_">Anchors:</a>
+      </h4>
+<p>
+        A '^' character shall match the start of a line when used as the first character
+        of an expression, or the first character of a sub-expression.
+      </p>
+<p>
+        A '$' character shall match the end of a line when used as the last character
+        of an expression, or the last character of a sub-expression.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.marked_sub_expressions_"></a><h4>
+<a name="id475615"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.marked_sub_expressions_">Marked
+        sub-expressions:</a>
+      </h4>
+<p>
+        A section beginning <tt class="computeroutput"><span class="special">\(</span></tt> and ending
+        <tt class="computeroutput"><span class="special">\)</span></tt> acts as a marked sub-expression.
+        Whatever matched the sub-expression is split out in a separate field by the
+        matching algorithms. Marked sub-expressions can also repeated, or referred-to
+        by a back-reference.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.repeats_"></a><h4>
+<a name="id475674"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.repeats_">Repeats:</a>
+      </h4>
+<p>
+        Any atom (a single character, a marked sub-expression, or a character class)
+        can be repeated with the * operator.
+      </p>
+<p>
+        For example <tt class="computeroutput"><span class="identifier">a</span><span class="special">*</span></tt>
+        will match any number of letter a's repeated zero or more times (an atom
+        repeated zero times matches an empty string), so the expression <tt class="computeroutput"><span class="identifier">a</span><span class="special">*</span><span class="identifier">b</span></tt>
+        will match any of the following:
+      </p>
+<pre class="programlisting">b
+ab
+aaaaaaaab
+</pre>
+<p>
+        An atom can also be repeated with a bounded repeat:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">\{</span><span class="identifier">n</span><span class="special">\}</span></tt> Matches
+        'a' repeated exactly n times.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">\{</span><span class="identifier">n</span><span class="special">,\}</span></tt> Matches
+        'a' repeated n or more times.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">\{</span><span class="identifier">n</span><span class="special">,</span> <span class="identifier">m</span><span class="special">\}</span></tt> Matches 'a' repeated between n and m times
+        inclusive.
+      </p>
+<p>
+        For example:
+      </p>
+<pre class="programlisting">^a{2,3}$</pre>
+<p>
+        Will match either of:
+      </p>
+<pre class="programlisting">aa
+aaa
+</pre>
+<p>
+        But neither of:
+      </p>
+<pre class="programlisting">a
+aaaa
+</pre>
+<p>
+        It is an error to use a repeat operator, if the preceding construct can not
+        be repeated, for example:
+      </p>
+<pre class="programlisting">a(*)</pre>
+<p>
+        Will raise an error, as there is nothing for the * operator to be applied
+        to.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.back_references_"></a><h4>
+<a name="id475920"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.back_references_">Back references:</a>
+      </h4>
+<p>
+        An escape character followed by a digit <span class="emphasis"><em>n</em></span>, where <span class="emphasis"><em>n</em></span>
+        is in the range 1-9, matches the same string that was matched by sub-expression
+        <span class="emphasis"><em>n</em></span>. For example the expression:
+      </p>
+<pre class="programlisting">^\(a*\).*\1$</pre>
+<p>
+        Will match the string:
+      </p>
+<pre class="programlisting">aaabbaaa</pre>
+<p>
+        But not the string:
+      </p>
+<pre class="programlisting">aaabba</pre>
+<a name="boost_regex.syntax.basic_syntax.character_sets_"></a><h4>
+<a name="id475996"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.character_sets_">Character
+        sets:</a>
+      </h4>
+<p>
+        A character set is a bracket-expression starting with [ and ending with ],
+        it defines a set of characters, and matches any single character that is
+        a member of that set.
+      </p>
+<p>
+        A bracket expression may contain any combination of the following:
+      </p>
+<a name="boost_regex.syntax.basic_syntax.single_characters_"></a><h5>
+<a name="id476034"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.single_characters_">Single
+        characters:</a>
+      </h5>
+<p>
+        For example <tt class="computeroutput"><span class="special">[</span><span class="identifier">abc</span><span class="special">]</span></tt>, will match any of the characters 'a', 'b',
+        or 'c'.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.character_ranges_"></a><h5>
+<a name="id476086"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.character_ranges_">Character
+        ranges:</a>
+      </h5>
+<p>
+        For example <tt class="computeroutput"><span class="special">[</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">]</span></tt>
+        will match any single character in the range 'a' to 'c'. By default, for
+        POSIX-Basic regular expressions, a character <span class="emphasis"><em>x</em></span> is within
+        the range <span class="emphasis"><em>y</em></span> to <span class="emphasis"><em>z</em></span>, if it collates
+        within that range; this results in locale specific behavior. This behavior
+        can be turned off by unsetting the <tt class="computeroutput"><span class="identifier">collate</span></tt>
+        option flag when constructing the regular expression - in which case whether
+        a character appears within a range is determined by comparing the code points
+        of the characters only.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.negation_"></a><h5>
+<a name="id476179"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.negation_">Negation:</a>
+      </h5>
+<p>
+        If the bracket-expression begins with the ^ character, then it matches the
+        complement of the characters it contains, for example <tt class="computeroutput"><span class="special">[^</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">]</span></tt> matches any character that is not in the
+        range a-c.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.character_classes_"></a><h5>
+<a name="id476241"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.character_classes_">Character
+        classes:</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">name</span><span class="special">:]]</span></tt>
+        matches the named character class "name", for example <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">lower</span><span class="special">:]]</span></tt> matches any lower case character. See
+        <a href="character_classes.html" title=" Character Class
+      Names">character class names</a>.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.collating_elements_"></a><h5>
+<a name="id476326"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.collating_elements_">Collating
+        Elements:</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[.</span><span class="identifier">col</span><span class="special">.]</span></tt> matches
+        the collating element <span class="emphasis"><em>col</em></span>. A collating element is any
+        single character, or any sequence of characters that collates as a single
+        unit. Collating elements may also be used as the end point of a range, for
+        example: <tt class="computeroutput"><span class="special">[[.</span><span class="identifier">ae</span><span class="special">.]-</span><span class="identifier">c</span><span class="special">]</span></tt>
+        matches the character sequence "ae", plus any single character
+        in the rangle "ae"-c, assuming that "ae" is treated as
+        a single collating element in the current locale.
+      </p>
+<p>
+        Collating elements may be used in place of escapes (which are not normally
+        allowed inside character sets), for example <tt class="computeroutput"><span class="special">[[.^.]</span><span class="identifier">abc</span><span class="special">]</span></tt> would
+        match either one of the characters 'abc^'.
+      </p>
+<p>
+        As an extension, a collating element may also be specified via its symbolic
+        name, for example:
+      </p>
+<pre class="programlisting">[[.NUL.]]</pre>
+<p>
+        matches a 'NUL' character. See <a href="collating_names.html" title=" Collating Names">collating
+        element names</a>.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.equivalence_classes_"></a><h5>
+<a name="id476472"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.equivalence_classes_">Equivalence
+        classes:</a>
+      </h5>
+<p>
+        An expression of theform <tt class="computeroutput"><span class="special">[[=</span><span class="identifier">col</span><span class="special">=]]</span></tt>,
+        matches any character or collating element whose primary sort key is the
+        same as that for collating element <span class="emphasis"><em>col</em></span>, as with collating
+        elements the name <span class="emphasis"><em>col</em></span> may be a <a href="collating_names.html" title=" Collating Names">collating
+        symbolic name</a>. A primary sort key is one that ignores case, accentation,
+        or locale-specific tailorings; so for example <tt class="computeroutput"><span class="special">[[=</span><span class="identifier">a</span><span class="special">=]]</span></tt> matches
+        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
+        of this is reliant on the platform's collation and localisation support;
+        this feature can not be relied upon to work portably across all platforms,
+        or even all locales on one platform.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.combinations_"></a><h5>
+<a name="id476585"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.combinations_">Combinations:</a>
+      </h5>
+<p>
+        All of the above can be combined in one character set declaration, for example:
+        <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">digit</span><span class="special">:]</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">[.</span><span class="identifier">NUL</span><span class="special">.]].</span></tt>
+      </p>
+<a name="boost_regex.syntax.basic_syntax.escapes"></a><h4>
+<a name="id476664"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.escapes">Escapes</a>
+      </h4>
+<p>
+        With the exception of the escape sequences \{, \}, \(, and \), which are
+        documented above, an escape followed by any character matches that character.
+        This can be used to make the special characters
+      </p>
+<pre class="programlisting">.[\*^$</pre>
+<p>
+        "ordinary". Note that the escape character loses its special meaning
+        inside a character set, so <tt class="computeroutput"><span class="special">[\^]</span></tt>
+        will match either a literal '\' or a '^'.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.what_gets_matched"></a><h3>
+<a name="id476723"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.what_gets_matched">What Gets
+        Matched</a>
+      </h3>
+<p>
+        When there is more that one way to match a regular expression, the "best"
+        possible match is obtained using the <a href="leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule">leftmost-longest
+        rule</a>.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.variations"></a><h3>
+<a name="id476764"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.variations">Variations</a>
+      </h3>
+<a name="boost_regex.grep_syntax"></a><p>
+      </p>
+<a name="boost_regex.syntax.basic_syntax.grep"></a><h4>
+<a name="id476798"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.grep">Grep</a>
+      </h4>
+<p>
+        When an expression is compiled with the flag <tt class="computeroutput"><span class="identifier">grep</span></tt>
+        set, then the expression is treated as a newline separated list of <a href="basic_syntax.html#boost_regex.posix_basic">POSIX-Basic expressions</a>, a match
+        is found if any of the expressions in the list match, for example:
+      </p>
+<pre class="programlisting">
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e</span><span class="special">(</span><span class="string">"abc\ndef"</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">grep</span><span class="special">);</span>
+</pre>
+<p>
+        will match either of the <a href="basic_syntax.html#boost_regex.posix_basic">POSIX-Basic
+        expressions</a> "abc" or "def".
+      </p>
+<p>
+        As its name suggests, this behavior is consistent with the Unix utility grep.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.emacs"></a><h4>
+<a name="id476945"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.emacs">emacs</a>
+      </h4>
+<p>
+        In addition to the <a href="basic_syntax.html#boost_regex.posix_basic">POSIX-Basic features</a>
+        the following characters are also special:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Character
+              </p>
+              </th>
+<th>
+              <p>
+                Description
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                +
+              </p>
+              </td>
+<td>
+              <p>
+                repeats the preceding atom one or more times.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                ?
+              </p>
+              </td>
+<td>
+              <p>
+                repeats the preceding atom zero or one times.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                *?
+              </p>
+              </td>
+<td>
+              <p>
+                A non-greedy version of *.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                +?
+              </p>
+              </td>
+<td>
+              <p>
+                A non-greedy version of +.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                ??
+              </p>
+              </td>
+<td>
+              <p>
+                A non-greedy version of ?.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        And the following escape sequences are also recognised:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Description
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                \|
+              </p>
+              </td>
+<td>
+              <p>
+                specifies an alternative.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \(?: ... )
+              </p>
+              </td>
+<td>
+              <p>
+                is a non-marking grouping construct - allows you to lexically group
+                something without spitting out an extra sub-expression.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \w
+              </p>
+              </td>
+<td>
+              <p>
+                matches any word character.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \W
+              </p>
+              </td>
+<td>
+              <p>
+                matches any non-word character.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \sx
+              </p>
+              </td>
+<td>
+              <p>
+                matches any character in the syntax group x, the following emacs
+                groupings are supported: 's', ' ', '_', 'w', '.', ')', '(', '"',
+                '\'', '&gt;' and '&lt;'. Refer to the emacs docs for details.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \Sx
+              </p>
+              </td>
+<td>
+              <p>
+                matches any character not in the syntax grouping x.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \c and \C
+              </p>
+              </td>
+<td>
+              <p>
+                These are not supported.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \`
+              </p>
+              </td>
+<td>
+              <p>
+                matches zero characters only at the start of a buffer (or string
+                being matched).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \'
+              </p>
+              </td>
+<td>
+              <p>
+                matches zero characters only at the end of a buffer (or string being
+                matched).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \b
+              </p>
+              </td>
+<td>
+              <p>
+                matches zero characters at a word boundary.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \B
+              </p>
+              </td>
+<td>
+              <p>
+                matches zero characters, not at a word boundary.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \&lt;
+              </p>
+              </td>
+<td>
+              <p>
+                matches zero characters only at the start of a word.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                \&gt;
+              </p>
+              </td>
+<td>
+              <p>
+                matches zero characters only at the end of a word.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        Finally, you should note that emacs style regular expressions are matched
+        according to the <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.what_gets_matched">Perl
+        "depth first search" rules</a>. Emacs expressions are matched
+        this way because they contain Perl-like extensions, that do not interact
+        well with the <a href="leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule">POSIX-style
+        leftmost-longest rule</a>.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.options"></a><h3>
+<a name="id477441"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.options">Options</a>
+      </h3>
+<p>
+        There are a <a href="../ref/syntax_option_type/syntax_option_type_basic.html" title="
+        Options for POSIX Basic Regular Expressions">variety
+        of flags</a> that may be combined with the <tt class="computeroutput"><span class="identifier">basic</span></tt>
+        and <tt class="computeroutput"><span class="identifier">grep</span></tt> options when constructing
+        the regular expression, in particular note that the <a href="../ref/syntax_option_type/syntax_option_type_basic.html" title="
+        Options for POSIX Basic Regular Expressions"><tt class="computeroutput"><span class="identifier">newline_alt</span></tt>, <tt class="computeroutput"><span class="identifier">no_char_classes</span></tt>,
+        <tt class="computeroutput"><span class="identifier">no</span><span class="special">-</span><span class="identifier">intervals</span></tt>, <tt class="computeroutput"><span class="identifier">bk_plus_qm</span></tt>
+        and <tt class="computeroutput"><span class="identifier">bk_plus_vbar</span></tt></a> options
+        all alter the syntax, while the <a href="../ref/syntax_option_type/syntax_option_type_basic.html" title="
+        Options for POSIX Basic Regular Expressions"><tt class="computeroutput"><span class="identifier">collate</span></tt> and <tt class="computeroutput"><span class="identifier">icase</span></tt>
+        options</a> modify how the case and locale sensitivity are to be applied.
+      </p>
+<a name="boost_regex.syntax.basic_syntax.references"></a><h3>
+<a name="id477617"></a>
+        <a href="basic_syntax.html#boost_regex.syntax.basic_syntax.references">References</a>
+      </h3>
+<p>
+        <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html" target="_top">IEEE
+        Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions
+        and Headers, Section 9, Regular Expressions (FWD.1).</a>
+      </p>
+<p>
+        <a href="http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html" target="_top">IEEE
+        Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and
+        Utilities, Section 4, Utilities, grep (FWD.1).</a>
+      </p>
+<p>
+        <a href="http://www.gnu.org/software/emacs/" target="_top">Emacs Version 21.3.</a>
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="basic_extended.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="character_classes.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/character_classes.html b/doc/html/boost_regex/syntax/character_classes.html
new file mode 100644
index 00000000..12d9356e
--- /dev/null
+++ b/doc/html/boost_regex/syntax/character_classes.html
@@ -0,0 +1,52 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Character Class
+      Names</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax.html" title=" Regular Expression Syntax">
+<link rel="prev" href="basic_syntax.html" title=" POSIX Basic Regular
+      Expression Syntax">
+<link rel="next" href="character_classes/std_char_clases.html" title="
+        Character Classes that are Always Supported">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="basic_syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="character_classes/std_char_clases.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.syntax.character_classes"></a><a href="character_classes.html" title=" Character Class
+      Names"> Character Class
+      Names</a></h3></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="character_classes/std_char_clases.html">
+        Character Classes that are Always Supported</a></span></dt>
+<dt><span class="section"><a href="character_classes/optional_char_class_names.html">
+        Character classes that are supported by Unicode Regular Expressions</a></span></dt>
+</dl></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="basic_syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="character_classes/std_char_clases.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..631ddf24
--- /dev/null
+++ b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
@@ -0,0 +1,549 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Character classes that are supported by Unicode Regular Expressions</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../character_classes.html" title=" Character Class
+      Names">
+<link rel="prev" href="std_char_clases.html" title="
+        Character Classes that are Always Supported">
+<link rel="next" href="../collating_names.html" title=" Collating Names">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="std_char_clases.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../character_classes.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../collating_names.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.syntax.character_classes.optional_char_class_names"></a><a href="optional_char_class_names.html" title="
+        Character classes that are supported by Unicode Regular Expressions">
+        Character classes that are supported by Unicode Regular Expressions</a></h4></div></div></div>
+<p>
+          The following character classes are only supported by Unicode Regular Expressions:
+          that is those that use the <tt class="computeroutput"><span class="identifier">u32regex</span></tt>
+          type. The names used are the same as those from Chapter 4 of the Unicode
+          standard.
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Short Name
+                </p>
+                </th>
+<th>
+                <p>
+                  Long Name
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
+                  ASCII
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
+                  Any
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
+                  Assigned
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  C*
+                </p>
+                </td>
+<td>
+                <p>
+                  Other
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Cc
+                </p>
+                </td>
+<td>
+                <p>
+                  Control
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Cf
+                </p>
+                </td>
+<td>
+                <p>
+                  Format
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Cn
+                </p>
+                </td>
+<td>
+                <p>
+                  Not Assigned
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Co
+                </p>
+                </td>
+<td>
+                <p>
+                  Private Use
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Cs
+                </p>
+                </td>
+<td>
+                <p>
+                  Surrogate
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  L*
+                </p>
+                </td>
+<td>
+                <p>
+                  Letter
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Ll
+                </p>
+                </td>
+<td>
+                <p>
+                  Lowercase Letter
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Lm
+                </p>
+                </td>
+<td>
+                <p>
+                  Modifier Letter
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Lo
+                </p>
+                </td>
+<td>
+                <p>
+                  Other Letter
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Lt
+                </p>
+                </td>
+<td>
+                <p>
+                  Titlecase
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Lu
+                </p>
+                </td>
+<td>
+                <p>
+                  Uppercase Letter
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  M*
+                </p>
+                </td>
+<td>
+                <p>
+                  Mark
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Mc
+                </p>
+                </td>
+<td>
+                <p>
+                  Spacing Combining Mark
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Me
+                </p>
+                </td>
+<td>
+                <p>
+                  Enclosing Mark
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Mn
+                </p>
+                </td>
+<td>
+                <p>
+                  Non-Spacing Mark
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  N*
+                </p>
+                </td>
+<td>
+                <p>
+                  Number
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Nd
+                </p>
+                </td>
+<td>
+                <p>
+                  Decimal Digit Number
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Nl
+                </p>
+                </td>
+<td>
+                <p>
+                  Letter Number
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Other Number
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  P*
+                </p>
+                </td>
+<td>
+                <p>
+                  Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Pc
+                </p>
+                </td>
+<td>
+                <p>
+                  Connector Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Pd
+                </p>
+                </td>
+<td>
+                <p>
+                  Dash Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Pe
+                </p>
+                </td>
+<td>
+                <p>
+                  Close Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Pf
+                </p>
+                </td>
+<td>
+                <p>
+                  Final Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Pi
+                </p>
+                </td>
+<td>
+                <p>
+                  Initial Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Po
+                </p>
+                </td>
+<td>
+                <p>
+                  Other Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Ps
+                </p>
+                </td>
+<td>
+                <p>
+                  Open Punctuation
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  S*
+                </p>
+                </td>
+<td>
+                <p>
+                  Symbol
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Sc
+                </p>
+                </td>
+<td>
+                <p>
+                  Currency Symbol
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Sk
+                </p>
+                </td>
+<td>
+                <p>
+                  Modifier Symbol
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Sm
+                </p>
+                </td>
+<td>
+                <p>
+                  Math Symbol
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  So
+                </p>
+                </td>
+<td>
+                <p>
+                  Other Symbol
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Z*
+                </p>
+                </td>
+<td>
+                <p>
+                  Separator
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Zl
+                </p>
+                </td>
+<td>
+                <p>
+                  Line Separator
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Zp
+                </p>
+                </td>
+<td>
+                <p>
+                  Paragraph Separator
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  Zs
+                </p>
+                </td>
+<td>
+                <p>
+                  Space Separator
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="std_char_clases.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../character_classes.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../collating_names.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..4a6bbd08
--- /dev/null
+++ b/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
@@ -0,0 +1,399 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Character Classes that are Always Supported</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../character_classes.html" title=" Character Class
+      Names">
+<link rel="prev" href="../character_classes.html" title=" Character Class
+      Names">
+<link rel="next" href="optional_char_class_names.html" title="
+        Character classes that are supported by Unicode Regular Expressions">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../character_classes.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../character_classes.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="optional_char_class_names.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.syntax.character_classes.std_char_clases"></a><a href="std_char_clases.html" title="
+        Character Classes that are Always Supported">
+        Character Classes that are Always Supported</a></h4></div></div></div>
+<p>
+          The following character class names are always supported by Boost.Regex:
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Name
+                </p>
+                </th>
+<th>
+                <p>
+                  POSIX-standard name
+                </p>
+                </th>
+<th>
+                <p>
+                  Description
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  alnum
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any alpha-numeric character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  alpha
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any alphabetic character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  blank
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any whitespace character that is not a line separator.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  cntrl
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any control character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  d
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Any decimal digit
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  digit
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any decimal digit.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  graph
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any graphical character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  l
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Any lower case character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  lower
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any lower case character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  print
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any printable character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  punct
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any punctuation character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  s
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Any whitespace character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  space
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any whitespace character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  unicode
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Any extended character whose code point is above 255 in value.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  u
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Any upper case character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  upper
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any upper case character.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  w
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Any word character (alphanumeric characters plus the underscore).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  word
+                </p>
+                </td>
+<td>
+                <p>
+                  No
+                </p>
+                </td>
+<td>
+                <p>
+                  Any word character (alphanumeric characters plus the underscore).
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  xdigit
+                </p>
+                </td>
+<td>
+                <p>
+                  Yes
+                </p>
+                </td>
+<td>
+                <p>
+                  Any hexadecimal digit character.
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../character_classes.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../character_classes.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="optional_char_class_names.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/collating_names.html b/doc/html/boost_regex/syntax/collating_names.html
new file mode 100644
index 00000000..991967a1
--- /dev/null
+++ b/doc/html/boost_regex/syntax/collating_names.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Collating Names</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax.html" title=" Regular Expression Syntax">
+<link rel="prev" href="character_classes/optional_char_class_names.html" title="
+        Character classes that are supported by Unicode Regular Expressions">
+<link rel="next" href="collating_names/digraphs.html" title=" Digraphs">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="character_classes/optional_char_class_names.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="collating_names/digraphs.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.syntax.collating_names"></a><a href="collating_names.html" title=" Collating Names"> Collating Names</a></h3></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="collating_names/digraphs.html"> Digraphs</a></span></dt>
+<dt><span class="section"><a href="collating_names/posix_symbolic_names.html">
+        POSIX Symbolic Names</a></span></dt>
+<dt><span class="section"><a href="collating_names/named_unicode.html">
+        Named Unicode Characters</a></span></dt>
+</dl></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="character_classes/optional_char_class_names.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="collating_names/digraphs.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/collating_names/digraphs.html b/doc/html/boost_regex/syntax/collating_names/digraphs.html
new file mode 100644
index 00000000..de77c8cc
--- /dev/null
+++ b/doc/html/boost_regex/syntax/collating_names/digraphs.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Digraphs</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../collating_names.html" title=" Collating Names">
+<link rel="prev" href="../collating_names.html" title=" Collating Names">
+<link rel="next" href="posix_symbolic_names.html" title="
+        POSIX Symbolic Names">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../collating_names.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../collating_names.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="posix_symbolic_names.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.syntax.collating_names.digraphs"></a><a href="digraphs.html" title=" Digraphs"> Digraphs</a></h4></div></div></div>
+<p>
+          The following are treated as valid digraphs when used as a collating name:
+        </p>
+<p>
+          "ae", "Ae", "AE", "ch", "Ch",
+          "CH", "ll", "Ll", "LL", "ss",
+          "Ss", "SS", "nj", "Nj", "NJ",
+          "dz", "Dz", "DZ", "lj", "Lj",
+          "LJ".
+        </p>
+<p>
+          So for example the expression:
+        </p>
+<pre class="programlisting">[[.ae.]-c] </pre>
+<p>
+          will match any character that collates between the digraph "ae"
+          and the character "c".
+        </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../collating_names.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../collating_names.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="posix_symbolic_names.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/collating_names/named_unicode.html b/doc/html/boost_regex/syntax/collating_names/named_unicode.html
new file mode 100644
index 00000000..4d8e0ca4
--- /dev/null
+++ b/doc/html/boost_regex/syntax/collating_names/named_unicode.html
@@ -0,0 +1,56 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        Named Unicode Characters</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../collating_names.html" title=" Collating Names">
+<link rel="prev" href="posix_symbolic_names.html" title="
+        POSIX Symbolic Names">
+<link rel="next" href="../leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="posix_symbolic_names.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../collating_names.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../leftmost_longest_rule.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.syntax.collating_names.named_unicode"></a><a href="named_unicode.html" title="
+        Named Unicode Characters">
+        Named Unicode Characters</a></h4></div></div></div>
+<p>
+          When using <a href="../../unicode.html" title=" Unicode and Boost.Regex">Unicode aware regular expressions</a>
+          (with the <tt class="computeroutput"><span class="identifier">u32regex</span></tt> type),
+          all the normal symbolic names for Unicode characters (those given in Unidata.txt)
+          are recognised. So for example:
+        </p>
+<pre class="programlisting">[[.CYRILLIC CAPITAL LETTER I.]] </pre>
+<p>
+          would match the Unicode character 0x0418.
+        </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="posix_symbolic_names.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../collating_names.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../leftmost_longest_rule.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
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
new file mode 100644
index 00000000..91f5931b
--- /dev/null
+++ b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
@@ -0,0 +1,986 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>
+        POSIX Symbolic Names</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../../index.html" title="Boost.Regex">
+<link rel="up" href="../collating_names.html" title=" Collating Names">
+<link rel="prev" href="digraphs.html" title=" Digraphs">
+<link rel="next" href="named_unicode.html" title="
+        Named Unicode Characters">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="digraphs.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../collating_names.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="named_unicode.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_regex.syntax.collating_names.posix_symbolic_names"></a><a href="posix_symbolic_names.html" title="
+        POSIX Symbolic Names">
+        POSIX Symbolic Names</a></h4></div></div></div>
+<p>
+          The following symbolic names are recognised as valid collating element
+          names, in addition to any single character, this allows you to write for
+          example:
+        </p>
+<pre class="programlisting">[[.left-square-bracket.][.right-square-bracket.]]</pre>
+<p>
+          if you wanted to match either "[" or "]".
+        </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Name
+                </p>
+                </th>
+<th>
+                <p>
+                  Character
+                </p>
+                </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  NUL
+                </p>
+                </td>
+<td>
+                <p>
+                  \x00
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  SOH
+                </p>
+                </td>
+<td>
+                <p>
+                  \x01
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  STX
+                </p>
+                </td>
+<td>
+                <p>
+                  \x02
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  ETX
+                </p>
+                </td>
+<td>
+                <p>
+                  \x03
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  EOT
+                </p>
+                </td>
+<td>
+                <p>
+                  \x04
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  ENQ
+                </p>
+                </td>
+<td>
+                <p>
+                  \x05
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  ACK
+                </p>
+                </td>
+<td>
+                <p>
+                  \x06
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  alert
+                </p>
+                </td>
+<td>
+                <p>
+                  \x07
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  backspace
+                </p>
+                </td>
+<td>
+                <p>
+                  \x08
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  tab
+                </p>
+                </td>
+<td>
+                <p>
+                  \t
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  newline
+                </p>
+                </td>
+<td>
+                <p>
+                  \n
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  vertical-tab
+                </p>
+                </td>
+<td>
+                <p>
+                  \v
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  form-feed
+                </p>
+                </td>
+<td>
+                <p>
+                  \f
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  carriage-return
+                </p>
+                </td>
+<td>
+                <p>
+                  \r
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  SO
+                </p>
+                </td>
+<td>
+                <p>
+                  \xE
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  SI
+                </p>
+                </td>
+<td>
+                <p>
+                  \xF
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  DLE
+                </p>
+                </td>
+<td>
+                <p>
+                  \x10
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  DC1
+                </p>
+                </td>
+<td>
+                <p>
+                  \x11
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  DC2
+                </p>
+                </td>
+<td>
+                <p>
+                  \x12
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  DC3
+                </p>
+                </td>
+<td>
+                <p>
+                  \x13
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  DC4
+                </p>
+                </td>
+<td>
+                <p>
+                  \x14
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  NAK
+                </p>
+                </td>
+<td>
+                <p>
+                  \x15
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  SYN
+                </p>
+                </td>
+<td>
+                <p>
+                  \x16
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  ETB
+                </p>
+                </td>
+<td>
+                <p>
+                  \x17
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  CAN
+                </p>
+                </td>
+<td>
+                <p>
+                  \x18
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  EM
+                </p>
+                </td>
+<td>
+                <p>
+                  \x19
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  SUB
+                </p>
+                </td>
+<td>
+                <p>
+                  \x1A
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  ESC
+                </p>
+                </td>
+<td>
+                <p>
+                  \x1B
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  IS4
+                </p>
+                </td>
+<td>
+                <p>
+                  \x1C
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  IS3
+                </p>
+                </td>
+<td>
+                <p>
+                  \x1D
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  IS2
+                </p>
+                </td>
+<td>
+                <p>
+                  \x1E
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  IS1
+                </p>
+                </td>
+<td>
+                <p>
+                  \x1F
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  space
+                </p>
+                </td>
+<td>
+                <p>
+                  \x20
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  exclamation-mark
+                </p>
+                </td>
+<td>
+                <p>
+                  !
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  quotation-mark
+                </p>
+                </td>
+<td>
+                <p>
+                  "
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  number-sign
+                </p>
+                </td>
+<td>
+                <p>
+                  #
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  dollar-sign
+                </p>
+                </td>
+<td>
+                <p>
+                  $
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  percent-sign
+                </p>
+                </td>
+<td>
+                <p>
+                  %
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  ampersand
+                </p>
+                </td>
+<td>
+                <p>
+                  &amp;
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  apostrophe
+                </p>
+                </td>
+<td>
+                <p>
+                  '
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  left-parenthesis
+                </p>
+                </td>
+<td>
+                <p>
+                  (
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  right-parenthesis
+                </p>
+                </td>
+<td>
+                <p>
+                  )
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  asterisk
+                </p>
+                </td>
+<td>
+                <p>
+                  *
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  plus-sign
+                </p>
+                </td>
+<td>
+                <p>
+                  +
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  comma
+                </p>
+                </td>
+<td>
+                <p>
+                  ,
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  hyphen
+                </p>
+                </td>
+<td>
+                <p>
+                  -
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  period
+                </p>
+                </td>
+<td>
+                <p>
+                  .
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  slash
+                </p>
+                </td>
+<td>
+                <p>
+                  /
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  zero
+                </p>
+                </td>
+<td>
+                <p>
+                  0
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  one
+                </p>
+                </td>
+<td>
+                <p>
+                  1
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  two
+                </p>
+                </td>
+<td>
+                <p>
+                  2
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  three
+                </p>
+                </td>
+<td>
+                <p>
+                  3
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  four
+                </p>
+                </td>
+<td>
+                <p>
+                  4
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  five
+                </p>
+                </td>
+<td>
+                <p>
+                  5
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  six
+                </p>
+                </td>
+<td>
+                <p>
+                  6
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  seven
+                </p>
+                </td>
+<td>
+                <p>
+                  7
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  eight
+                </p>
+                </td>
+<td>
+                <p>
+                  8
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  nine
+                </p>
+                </td>
+<td>
+                <p>
+                  9
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  colon
+                </p>
+                </td>
+<td>
+                <p>
+                  :
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  semicolon
+                </p>
+                </td>
+<td>
+                <p>
+                  ;
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  less-than-sign
+                </p>
+                </td>
+<td>
+                <p>
+                  &lt;
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  equals-sign
+                </p>
+                </td>
+<td>
+                <p>
+                  =
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  greater-than-sign
+                </p>
+                </td>
+<td>
+                <p>
+                  &gt;
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  question-mark
+                </p>
+                </td>
+<td>
+                <p>
+                  ?
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  commercial-at
+                </p>
+                </td>
+<td>
+                <p>
+                  @
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  left-square-bracket
+                </p>
+                </td>
+<td>
+                <p>
+                  [
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  backslash
+                </p>
+                </td>
+<td>
+                <p>
+                  \
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  right-square-bracket
+                </p>
+                </td>
+<td>
+                <p>
+                  ]
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  circumflex
+                </p>
+                </td>
+<td>
+                <p>
+                  ~
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  underscore
+                </p>
+                </td>
+<td>
+                <p>
+                  _
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  grave-accent
+                </p>
+                </td>
+<td>
+                <p>
+                  `
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  left-curly-bracket
+                </p>
+                </td>
+<td>
+                <p>
+                  {
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  vertical-line
+                </p>
+                </td>
+<td>
+                <p>
+                  |
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  right-curly-bracket
+                </p>
+                </td>
+<td>
+                <p>
+                  }
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  tilde
+                </p>
+                </td>
+<td>
+                <p>
+                  ~
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  DEL
+                </p>
+                </td>
+<td>
+                <p>
+                  \x7F
+                </p>
+                </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="digraphs.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../collating_names.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="named_unicode.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/leftmost_longest_rule.html b/doc/html/boost_regex/syntax/leftmost_longest_rule.html
new file mode 100644
index 00000000..27d5a838
--- /dev/null
+++ b/doc/html/boost_regex/syntax/leftmost_longest_rule.html
@@ -0,0 +1,80 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> The Leftmost
+      Longest Rule</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax.html" title=" Regular Expression Syntax">
+<link rel="prev" href="collating_names/named_unicode.html" title="
+        Named Unicode Characters">
+<link rel="next" href="../format.html" title=" Search and Replace Format String Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="collating_names/named_unicode.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../format.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.syntax.leftmost_longest_rule"></a><a href="leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule"> The Leftmost
+      Longest Rule</a></h3></div></div></div>
+<p>
+        Often there is more than one way of matching a regular expression at a particular
+        location, for POSIX basic and extended regular expressions, the "best"
+        match is determined as follows:
+      </p>
+<div class="orderedlist"><ol type="1">
+<li>
+          Find the leftmost match, if there is only one match possible at this location
+          then return it.
+        </li>
+<li>
+          Find the longest of the possible matches, along with any ties. If there
+          is only one such possible match then return it.
+        </li>
+<li>
+          If there are no marked sub-expressions, then all the remaining alternatives
+          are indistinguishable; return the first of these found.
+        </li>
+<li>
+          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.
+        </li>
+<li>
+          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.
+        </li>
+<li>
+          Repeat steps 4 and 5 for each additional marked sub-expression.
+        </li>
+<li>
+          If there is still more than one possible match remaining, then they are
+          indistinguishable; return the first one found.
+        </li>
+</ol></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="collating_names/named_unicode.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../format.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/syntax/perl_syntax.html b/doc/html/boost_regex/syntax/perl_syntax.html
new file mode 100644
index 00000000..dc98edba
--- /dev/null
+++ b/doc/html/boost_regex/syntax/perl_syntax.html
@@ -0,0 +1,1350 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Perl Regular Expression
+      Syntax</title>
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../../index.html" title="Boost.Regex">
+<link rel="up" href="../syntax.html" title=" Regular Expression Syntax">
+<link rel="prev" href="../syntax.html" title=" Regular Expression Syntax">
+<link rel="next" href="basic_extended.html" title=" POSIX Extended Regular
+      Expression Syntax">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="basic_extended.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_regex.syntax.perl_syntax"></a><a href="perl_syntax.html" title=" Perl Regular Expression
+      Syntax"> Perl Regular Expression
+      Syntax</a></h3></div></div></div>
+<a name="boost_regex.syntax.perl_syntax.synopsis"></a><h3>
+<a name="id463745"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.synopsis">Synopsis</a>
+      </h3>
+<p>
+        The Perl regular expression syntax is based on that used by the programming
+        language Perl . Perl regular expressions are the default behavior in Boost.Regex
+        or you can pass the flag <tt class="computeroutput"><span class="identifier">perl</span></tt>
+        to the <a href="../ref/basic_regex.html" title=" basic_regex"><tt class="computeroutput"><span class="identifier">basic_regex</span></tt></a>
+        constructor, for example:
+      </p>
+<pre class="programlisting">
+<span class="comment">// e1 is a case sensitive Perl regular expression: 
+</span><span class="comment">// since Perl is the default option there's no need to explicitly specify the syntax used here:
+</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e1</span><span class="special">(</span><span class="identifier">my_expression</span><span class="special">);</span>
+<span class="comment">// e2 a case insensitive Perl regular expression:
+</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e2</span><span class="special">(</span><span class="identifier">my_expression</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">perl</span><span class="special">|</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">icase</span><span class="special">);</span>
+</pre>
+<a name="boost_regex.syntax.perl_syntax.perl_regular_expression_syntax"></a><h3>
+<a name="id463969"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.perl_regular_expression_syntax">Perl
+        Regular Expression Syntax</a>
+      </h3>
+<p>
+        In Perl regular expressions, all characters match themselves except for the
+        following special characters:
+      </p>
+<pre class="programlisting">.[{()\*+?|^$</pre>
+<a name="boost_regex.syntax.perl_syntax.wildcard"></a><h4>
+<a name="id464008"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.wildcard">Wildcard</a>
+      </h4>
+<p>
+        The single character '.' when used outside of a character set will match
+        any single character except:
+      </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+          The NULL character when the <a href="../ref/match_flag_type.html" title=" match_flag_type">flag
+          <tt class="computeroutput"><span class="identifier">match_no_dot_null</span></tt></a>
+          is passed to the matching algorithms.
+        </li>
+<li>
+          The newline character when the <a href="../ref/match_flag_type.html" title=" match_flag_type">flag
+          <tt class="computeroutput"><span class="identifier">match_not_dot_newline</span></tt></a>
+          is passed to the matching algorithms.
+        </li>
+</ul></div>
+<a name="boost_regex.syntax.perl_syntax.anchors"></a><h4>
+<a name="id464091"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.anchors">Anchors</a>
+      </h4>
+<p>
+        A '^' character shall match the start of a line.
+      </p>
+<p>
+        A '$' character shall match the end of a line.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.marked_sub_expressions"></a><h4>
+<a name="id464126"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.marked_sub_expressions">Marked
+        sub-expressions</a>
+      </h4>
+<p>
+        A section beginning <tt class="computeroutput"><span class="special">(</span></tt> and ending
+        <tt class="computeroutput"><span class="special">)</span></tt> acts as a marked sub-expression.
+        Whatever matched the sub-expression is split out in a separate field by the
+        matching algorithms. Marked sub-expressions can also repeated, or referred
+        to by a back-reference.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.non_marking_grouping"></a><h4>
+<a name="id464183"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.non_marking_grouping">Non-marking
+        grouping</a>
+      </h4>
+<p>
+        A marked sub-expression is useful to lexically group part of a regular expression,
+        but has the side-effect of spitting out an extra field in the result. As
+        an alternative you can lexically group part of a regular expression, without
+        generating a marked sub-expression by using <tt class="computeroutput"><span class="special">(?:</span></tt>
+        and <tt class="computeroutput"><span class="special">)</span></tt> , for example <tt class="computeroutput"><span class="special">(?:</span><span class="identifier">ab</span><span class="special">)+</span></tt>
+        will repeat <tt class="computeroutput"><span class="identifier">ab</span></tt> without splitting
+        out any separate sub-expressions.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.repeats"></a><h4>
+<a name="id464274"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.repeats">Repeats</a>
+      </h4>
+<p>
+        Any atom (a single character, a marked sub-expression, or a character class)
+        can be repeated with the <tt class="computeroutput"><span class="special">*</span></tt>,
+        <tt class="computeroutput"><span class="special">+</span></tt>, <tt class="computeroutput"><span class="special">?</span></tt>,
+        and <tt class="computeroutput"><span class="special">{}</span></tt> operators.
+      </p>
+<p>
+        The <tt class="computeroutput"><span class="special">*</span></tt> operator will match the
+        preceding atom zero or more times, for example the expression <tt class="computeroutput"><span class="identifier">a</span><span class="special">*</span><span class="identifier">b</span></tt>
+        will match any of the following:
+      </p>
+<pre class="programlisting">
+<span class="identifier">b</span>
+<span class="identifier">ab</span>
+<span class="identifier">aaaaaaaab</span>
+</pre>
+<p>
+        The <tt class="computeroutput"><span class="special">+</span></tt> operator will match the
+        preceding atom one or more times, for example the expression <tt class="computeroutput"><span class="identifier">a</span><span class="special">+</span><span class="identifier">b</span></tt>
+        will match any of the following:
+      </p>
+<pre class="programlisting">
+<span class="identifier">ab</span>
+<span class="identifier">aaaaaaaab</span>
+</pre>
+<p>
+        But will not match:
+      </p>
+<pre class="programlisting">
+<span class="identifier">b</span>
+</pre>
+<p>
+        The <tt class="computeroutput"><span class="special">?</span></tt> operator will match the
+        preceding atom zero or one times, for example the expression ca?b will match
+        any of the following:
+      </p>
+<pre class="programlisting">
+<span class="identifier">cb</span>
+<span class="identifier">cab</span>
+</pre>
+<p>
+        But will not match:
+      </p>
+<pre class="programlisting">
+<span class="identifier">caab</span>
+</pre>
+<p>
+        An atom can also be repeated with a bounded repeat:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">{</span><span class="identifier">n</span><span class="special">}</span></tt> Matches
+        'a' repeated exactly n times.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">{</span><span class="identifier">n</span><span class="special">,}</span></tt> Matches
+        'a' repeated n or more times.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="identifier">a</span><span class="special">{</span><span class="identifier">n</span><span class="special">,</span> <span class="identifier">m</span><span class="special">}</span></tt> Matches 'a' repeated between n and m times
+        inclusive.
+      </p>
+<p>
+        For example:
+      </p>
+<pre class="programlisting">^a{2,3}$</pre>
+<p>
+        Will match either of:
+      </p>
+<pre class="programlisting">
+<span class="identifier">aa</span>
+<span class="identifier">aaa</span>
+</pre>
+<p>
+        But neither of:
+      </p>
+<pre class="programlisting">
+<span class="identifier">a</span>
+<span class="identifier">aaaa</span>
+</pre>
+<p>
+        It is an error to use a repeat operator, if the preceding construct can not
+        be repeated, for example:
+      </p>
+<pre class="programlisting">
+<span class="identifier">a</span><span class="special">(*)</span>
+</pre>
+<p>
+        Will raise an error, as there is nothing for the <tt class="computeroutput"><span class="special">*</span></tt>
+        operator to be applied to.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.non_greedy_repeats"></a><h4>
+<a name="id464758"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.non_greedy_repeats">Non greedy
+        repeats</a>
+      </h4>
+<p>
+        The normal repeat operators are "greedy", that is to say they will
+        consume as much input as possible. There are non-greedy versions available
+        that will consume as little input as possible while still producing a match.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">*?</span></tt> Matches the previous atom
+        zero or more times, while consuming as little input as possible.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">+?</span></tt> Matches the previous atom
+        one or more times, while consuming as little input as possible.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">??</span></tt> Matches the previous atom
+        zero or one times, while consuming as little input as possible.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">{</span><span class="identifier">n</span><span class="special">,}?</span></tt> Matches the previous atom n or more times,
+        while consuming as little input as possible.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">{</span><span class="identifier">n</span><span class="special">,</span><span class="identifier">m</span><span class="special">}?</span></tt>
+        Matches the previous atom between n and m times, while consuming as little
+        input as possible.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.back_references"></a><h4>
+<a name="id464905"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.back_references">Back references</a>
+      </h4>
+<p>
+        An escape character followed by a digit <span class="emphasis"><em>n</em></span>, where <span class="emphasis"><em>n</em></span>
+        is in the range 1-9, matches the same string that was matched by sub-expression
+        <span class="emphasis"><em>n</em></span>. For example the expression:
+      </p>
+<pre class="programlisting">^(a*).*\1$</pre>
+<p>
+        Will match the string:
+      </p>
+<pre class="programlisting">
+<span class="identifier">aaabbaaa</span>
+</pre>
+<p>
+        But not the string:
+      </p>
+<pre class="programlisting">
+<span class="identifier">aaabba</span>
+</pre>
+<a name="boost_regex.syntax.perl_syntax.alternation"></a><h4>
+<a name="id464992"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.alternation">Alternation</a>
+      </h4>
+<p>
+        The <tt class="computeroutput"><span class="special">|</span></tt> operator will match either
+        of its arguments, so for example: <tt class="computeroutput"><span class="identifier">abc</span><span class="special">|</span><span class="identifier">def</span></tt> will
+        match either "abc" or "def".
+      </p>
+<p>
+        Parenthesis can be used to group alternations, for example: <tt class="computeroutput"><span class="identifier">ab</span><span class="special">(</span><span class="identifier">d</span><span class="special">|</span><span class="identifier">ef</span><span class="special">)</span></tt>
+        will match either of "abd" or "abef".
+      </p>
+<p>
+        Empty alternatives are not allowed (these are almost always a mistake), but
+        if you really want an empty alternative use <tt class="computeroutput"><span class="special">(?:)</span></tt>
+        as a placeholder, for example:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">|</span><span class="identifier">abc</span></tt>
+        is not a valid expression, but
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">(?:)|</span><span class="identifier">abc</span></tt>
+        is and is equivalent, also the expression:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">(?:</span><span class="identifier">abc</span><span class="special">)??</span></tt> has exactly the same effect.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.character_sets"></a><h4>
+<a name="id465181"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.character_sets">Character sets</a>
+      </h4>
+<p>
+        A character set is a bracket-expression starting with <tt class="computeroutput"><span class="special">[</span></tt>
+        and ending with <tt class="computeroutput"><span class="special">]</span></tt>, it defines
+        a set of characters, and matches any single character that is a member of
+        that set.
+      </p>
+<p>
+        A bracket expression may contain any combination of the following:
+      </p>
+<a name="boost_regex.syntax.perl_syntax.single_characters"></a><h5>
+<a name="id465243"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.single_characters">Single characters</a>
+      </h5>
+<p>
+        For example <tt class="computeroutput"><span class="special">[</span><span class="identifier">abc</span><span class="special">]</span></tt>, will match any of the characters 'a', 'b',
+        or 'c'.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.character_ranges"></a><h5>
+<a name="id465294"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.character_ranges">Character
+        ranges</a>
+      </h5>
+<p>
+        For example <tt class="computeroutput"><span class="special">[</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">]</span></tt>
+        will match any single character in the range 'a' to 'c'. By default, for
+        Perl regular expressions, a character x is within the range y to z, if the
+        code point of the character lies within the codepoints of the endpoints of
+        the range. Alternatively, if you set the <a href="../ref/syntax_option_type/syntax_option_type_perl.html" title="
+        Options for Perl Regular Expressions"><tt class="computeroutput"><span class="identifier">collate</span></tt> flag</a> when constructing the
+        regular expression, then ranges are locale sensitive.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.negation"></a><h5>
+<a name="id465376"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.negation">Negation</a>
+      </h5>
+<p>
+        If the bracket-expression begins with the ^ character, then it matches the
+        complement of the characters it contains, for example <tt class="computeroutput"><span class="special">[^</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">]</span></tt> matches any character that is not in the
+        range <tt class="computeroutput"><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span></tt>.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.character_classes"></a><h5>
+<a name="id465460"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.character_classes">Character
+        classes</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">name</span><span class="special">:]]</span></tt>
+        matches the named character class "name", for example <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">lower</span><span class="special">:]]</span></tt> matches any lower case character. See
+        <a href="character_classes.html" title=" Character Class
+      Names">character class names</a>.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.collating_elements"></a><h5>
+<a name="id465545"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.collating_elements">Collating
+        Elements</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[.</span><span class="identifier">col</span><span class="special">.]</span></tt> matches
+        the collating element <span class="emphasis"><em>col</em></span>. A collating element is any
+        single character, or any sequence of characters that collates as a single
+        unit. Collating elements may also be used as the end point of a range, for
+        example: <tt class="computeroutput"><span class="special">[[.</span><span class="identifier">ae</span><span class="special">.]-</span><span class="identifier">c</span><span class="special">]</span></tt>
+        matches the character sequence "ae", plus any single character
+        in the range "ae"-c, assuming that "ae" is treated as
+        a single collating element in the current locale.
+      </p>
+<p>
+        As an extension, a collating element may also be specified via it's <a href="collating_names.html" title=" Collating Names">symbolic name</a>, for example:
+      </p>
+<pre class="programlisting">
+<span class="special">[[.</span><span class="identifier">NUL</span><span class="special">.]]</span>
+</pre>
+<p>
+        matches a <tt class="computeroutput"><span class="special">\</span><span class="number">0</span></tt>
+        character.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.equivalence_classes"></a><h5>
+<a name="id465697"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.equivalence_classes">Equivalence
+        classes</a>
+      </h5>
+<p>
+        An expression of the form <tt class="computeroutput"><span class="special">[[=</span><span class="identifier">col</span><span class="special">=]]</span></tt>,
+        matches any character or collating element whose primary sort key is the
+        same as that for collating element <span class="emphasis"><em>col</em></span>, as with collating
+        elements the name <span class="emphasis"><em>col</em></span> may be a <a href="collating_names.html" title=" Collating Names">symbolic
+        name</a>. A primary sort key is one that ignores case, accentation, or
+        locale-specific tailorings; so for example <tt class="computeroutput"><span class="special">[[=</span><span class="identifier">a</span><span class="special">=]]</span></tt> matches
+        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
+        of this is reliant on the platform's collation and localisation support;
+        this feature can not be relied upon to work portably across all platforms,
+        or even all locales on one platform.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.escaped_characters"></a><h5>
+<a name="id465807"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.escaped_characters">Escaped
+        Characters</a>
+      </h5>
+<p>
+        All the escape sequences that match a single character, or a single character
+        class are permitted within a character class definition. For example <tt class="computeroutput"><span class="special">[\[\]]</span></tt> would match either of <tt class="computeroutput"><span class="special">[</span></tt> or <tt class="computeroutput"><span class="special">]</span></tt>
+        while <tt class="computeroutput"><span class="special">[\</span><span class="identifier">W</span><span class="special">\</span><span class="identifier">d</span><span class="special">]</span></tt>
+        would match any character that is either a "digit", <span class="emphasis"><em>or</em></span>
+        is <span class="emphasis"><em>not</em></span> a "word" character.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.combinations"></a><h5>
+<a name="id465914"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.combinations">Combinations</a>
+      </h5>
+<p>
+        All of the above can be combined in one character set declaration, for example:
+        <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">digit</span><span class="special">:]</span><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span><span class="special">[.</span><span class="identifier">NUL</span><span class="special">.]]</span></tt>.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.escapes"></a><h4>
+<a name="id465993"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.escapes">Escapes</a>
+      </h4>
+<p>
+        Any special character preceded by an escape shall match itself.
+      </p>
+<p>
+        The following escape sequences are all synonyms for single characters:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape
+              </p>
+              </th>
+<th>
+              <p>
+                Character
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">a</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">a</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">e</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="number">0x1B</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">f</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">f</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">n</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">n</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">r</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">r</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">t</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">t</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">v</span>
+                </tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">v</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">b</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">b</span></tt>
+                (but only inside a character class declaration).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">cX</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                An ASCII escape sequence - the character whose code point is X %
+                32
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">xdd</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                A hexadecimal escape sequence - matches the single character whose
+                code point is 0xdd.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">x</span><span class="special">{</span><span class="identifier">dddd</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                A hexadecimal escape sequence - matches the single character whose
+                code point is 0xdddd.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="number">0ddd</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                An octal escape sequence - matches the single character whose code
+                point is 0ddd.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">N</span><span class="special">{</span><span class="identifier">name</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches the single character which has the <a href="collating_names.html" title=" Collating Names">symbolic
+                name</a> <span class="emphasis"><em>name</em></span>. For example <tt class="computeroutput"><span class="special">\</span><span class="identifier">N</span><span class="special">{</span><span class="identifier">newline</span><span class="special">}</span></tt> matches the single character \n.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.perl_syntax._quot_single_character_quot__character_classes_"></a><h5>
+<a name="id466708"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax._quot_single_character_quot__character_classes_">"Single
+        character" character classes:</a>
+      </h5>
+<p>
+        Any escaped character <span class="emphasis"><em>x</em></span>, if <span class="emphasis"><em>x</em></span> is
+        the name of a character class shall match any character that is a member
+        of that class, and any escaped character <span class="emphasis"><em>X</em></span>, if <span class="emphasis"><em>x</em></span>
+        is the name of a character class, shall match any character not in that class.
+      </p>
+<p>
+        The following are supported by default:
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Escape sequence
+              </p>
+              </th>
+<th>
+              <p>
+                Equivalent to
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">d</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">digit</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">l</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">lower</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">s</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">space</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">u</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">upper</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">w</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">word</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">D</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">digit</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">L</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">lower</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">S</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">space</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">U</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">upper</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">W</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">word</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.perl_syntax.character_properties"></a><h5>
+<a name="id467341"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.character_properties">Character
+        Properties</a>
+      </h5>
+<p>
+        The character property names in the following table are all equivalent to
+        the <a href="character_classes.html" title=" Character Class
+      Names">names used in character
+        classes</a>.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Form
+              </p>
+              </th>
+<th>
+              <p>
+                Description
+              </p>
+              </th>
+<th>
+              <p>
+                Equivalent character set form
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">pX</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that has the property X.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">X</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">p</span><span class="special">{</span><span class="identifier">Name</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that has the property Name.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">Name</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">PX</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that does not have the property X.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">X</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">\</span><span class="identifier">P</span><span class="special">{</span><span class="identifier">Name</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches any character that does not have the property Name.
+              </p>
+              </td>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">[^[:</span><span class="identifier">Name</span><span class="special">:]]</span></tt>
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<p>
+        For example <tt class="computeroutput"><span class="special">\</span><span class="identifier">pd</span></tt>
+        matches any "digit" character, as does <tt class="computeroutput"><span class="special">\</span><span class="identifier">p</span><span class="special">{</span><span class="identifier">digit</span><span class="special">}</span></tt>.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.word_boundaries"></a><h5>
+<a name="id467752"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.word_boundaries">Word Boundaries</a>
+      </h5>
+<p>
+        The following escape sequences match the boundaries of words:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">\&lt;</span></tt> Matches the start of a
+        word.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">\&gt;</span></tt> Matches the end of a word.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">\</span><span class="identifier">b</span></tt>
+        Matches a word boundary (the start or end of a word).
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">\</span><span class="identifier">B</span></tt>
+        Matches only when not at a word boundary.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.buffer_boundaries"></a><h5>
+<a name="id467856"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.buffer_boundaries">Buffer boundaries</a>
+      </h5>
+<p>
+        The following match only at buffer boundaries: a "buffer" in this
+        context is the whole of the input text that is being matched against (note
+        that ^ and $ may match embedded newlines within the text).
+      </p>
+<p>
+        \` Matches at the start of a buffer only.
+      </p>
+<p>
+        \' Matches at the end of a buffer only.
+      </p>
+<p>
+        \A Matches at the start of a buffer only (the same as \`).
+      </p>
+<p>
+        \z Matches at the end of a buffer only (the same as \').
+      </p>
+<p>
+        \Z Matches an optional sequence of newlines at the end of a buffer: equivalent
+        to the regular expression <tt class="computeroutput"><span class="special">\</span><span class="identifier">n</span><span class="special">*\</span><span class="identifier">z</span></tt>
+      </p>
+<a name="boost_regex.syntax.perl_syntax.continuation_escape"></a><h5>
+<a name="id467940"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.continuation_escape">Continuation
+        Escape</a>
+      </h5>
+<p>
+        The sequence <tt class="computeroutput"><span class="special">\</span><span class="identifier">G</span></tt>
+        matches only at the end of the last match found, or at the start of the text
+        being matched if no previous match was found. This escape useful if you're
+        iterating over the matches contained within a text, and you want each subsequence
+        match to start where the last one ended.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.quoting_escape"></a><h5>
+<a name="id467993"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.quoting_escape">Quoting escape</a>
+      </h5>
+<p>
+        The escape sequence <tt class="computeroutput"><span class="special">\</span><span class="identifier">Q</span></tt>
+        begins a "quoted sequence": all the subsequent characters are treated
+        as literals, until either the end of the regular expression or \E is found.
+        For example the expression: <tt class="computeroutput"><span class="special">\</span><span class="identifier">Q</span><span class="special">\*+\</span><span class="identifier">Ea</span><span class="special">+</span></tt> would match either of:
+      </p>
+<pre class="programlisting">
+<span class="special">\*+</span><span class="identifier">a</span>
+<span class="special">\*+</span><span class="identifier">aaa</span>
+</pre>
+<a name="boost_regex.syntax.perl_syntax.unicode_escapes"></a><h5>
+<a name="id468098"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.unicode_escapes">Unicode escapes</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">\</span><span class="identifier">C</span></tt>
+        Matches a single code point: in Boost regex this has exactly the same effect
+        as a "." operator. <tt class="computeroutput"><span class="special">\</span><span class="identifier">X</span></tt> Matches a combining character sequence:
+        that is any non-combining character followed by a sequence of zero or more
+        combining characters.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.any_other_escape"></a><h5>
+<a name="id468164"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.any_other_escape">Any other
+        escape</a>
+      </h5>
+<p>
+        Any other escape sequence matches the character that is escaped, for example
+        \@ matches a literal '@'.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.perl_extended_patterns"></a><h4>
+<a name="id468194"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.perl_extended_patterns">Perl
+        Extended Patterns</a>
+      </h4>
+<p>
+        Perl-specific extensions to the regular expression syntax all start with
+        <tt class="computeroutput"><span class="special">(?</span></tt>.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.comments"></a><h5>
+<a name="id468236"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.comments">Comments</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">(?</span># <span class="special">...</span>
+        <span class="special">)</span></tt> is treated as a comment, it's contents
+        are ignored.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.modifiers"></a><h5>
+<a name="id468290"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.modifiers">Modifiers</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">(?</span><span class="identifier">imsx</span><span class="special">-</span><span class="identifier">imsx</span> <span class="special">...</span> <span class="special">)</span></tt> alters
+        which of the perl modifiers are in effect within the pattern, changes take
+        effect from the point that the block is first seen and extend to any enclosing
+        <tt class="computeroutput"><span class="special">)</span></tt>. Letters before a '-' turn
+        that perl modifier on, letters afterward, turn it off.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">(?</span><span class="identifier">imsx</span><span class="special">-</span><span class="identifier">imsx</span><span class="special">:</span><span class="identifier">pattern</span><span class="special">)</span></tt>
+        applies the specified modifiers to pattern only.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.non_marking_groups"></a><h5>
+<a name="id468418"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.non_marking_groups">Non-marking
+        groups</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">(?:</span><span class="identifier">pattern</span><span class="special">)</span></tt> lexically groups pattern, without generating
+        an additional sub-expression.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.lookahead"></a><h5>
+<a name="id468471"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.lookahead">Lookahead</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">(?=</span><span class="identifier">pattern</span><span class="special">)</span></tt> consumes zero characters, only if pattern
+        matches.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">(?!</span><span class="identifier">pattern</span><span class="special">)</span></tt> consumes zero characters, only if pattern
+        does not match.
+      </p>
+<p>
+        Lookahead is typically used to create the logical AND of two regular expressions,
+        for example if a password must contain a lower case letter, an upper case
+        letter, a punctuation symbol, and be at least 6 characters long, then the
+        expression:
+      </p>
+<pre class="programlisting">
+<span class="special">(?=.*[[:</span><span class="identifier">lower</span><span class="special">:]])(?=.*[[:</span><span class="identifier">upper</span><span class="special">:]])(?=.*[[:</span><span class="identifier">punct</span><span class="special">:]]).{</span><span class="number">6</span><span class="special">,}</span>
+</pre>
+<p>
+        could be used to validate the password.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.lookbehind"></a><h5>
+<a name="id468615"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.lookbehind">Lookbehind</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">(?&lt;=</span><span class="identifier">pattern</span><span class="special">)</span></tt> consumes zero characters, only if pattern
+        could be matched against the characters preceding the current position (pattern
+        must be of fixed length).
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">(?&lt;!</span><span class="identifier">pattern</span><span class="special">)</span></tt> consumes zero characters, only if pattern
+        could not be matched against the characters preceding the current position
+        (pattern must be of fixed length).
+      </p>
+<a name="boost_regex.syntax.perl_syntax.independent_sub_expressions"></a><h5>
+<a name="id468695"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.independent_sub_expressions">Independent
+        sub-expressions</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">(?&gt;</span><span class="identifier">pattern</span><span class="special">)</span></tt> <span class="emphasis"><em>pattern</em></span> is matched
+        independently of the surrounding patterns, the expression will never backtrack
+        into <span class="emphasis"><em>pattern</em></span>. Independent sub-expressions are typically
+        used to improve performance; only the best possible match for pattern will
+        be considered, if this doesn't allow the expression as a whole to match then
+        no match is found at all.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.conditional_expressions"></a><h5>
+<a name="id468762"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.conditional_expressions">Conditional
+        Expressions</a>
+      </h5>
+<p>
+        <tt class="computeroutput"><span class="special">(?(</span><span class="identifier">condition</span><span class="special">)</span><span class="identifier">yes</span><span class="special">-</span><span class="identifier">pattern</span><span class="special">|</span><span class="identifier">no</span><span class="special">-</span><span class="identifier">pattern</span><span class="special">)</span></tt> attempts to match <span class="emphasis"><em>yes-pattern</em></span>
+        if the <span class="emphasis"><em>condition</em></span> is true, otherwise attempts to match
+        <span class="emphasis"><em>no-pattern</em></span>.
+      </p>
+<p>
+        <tt class="computeroutput"><span class="special">(?(</span><span class="identifier">condition</span><span class="special">)</span><span class="identifier">yes</span><span class="special">-</span><span class="identifier">pattern</span><span class="special">)</span></tt>
+        attempts to match <span class="emphasis"><em>yes-pattern</em></span> if the <span class="emphasis"><em>condition</em></span>
+        is true, otherwise fails.
+      </p>
+<p>
+        <span class="emphasis"><em>condition</em></span> may be either a forward lookahead assert,
+        or the index of a marked sub-expression (the condition becomes true if the
+        sub-expression has been matched).
+      </p>
+<a name="boost_regex.syntax.perl_syntax.operator_precedence"></a><h4>
+<a name="id468932"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.operator_precedence">Operator
+        precedence</a>
+      </h4>
+<p>
+        The order of precedence for of operators is as follows:
+      </p>
+<div class="orderedlist"><ol type="1">
+<li>
+          Collation-related bracket symbols <tt class="computeroutput"><span class="special">[==]</span>
+          <span class="special">[::]</span> <span class="special">[..]</span></tt>
+</li>
+<li>
+          Escaped characters <tt class="computeroutput"><span class="special">\</span></tt>
+</li>
+<li>
+          Character set (bracket expression) <tt class="computeroutput"><span class="special">[]</span></tt>
+</li>
+<li>
+          Grouping <tt class="computeroutput"><span class="special">()</span></tt>
+</li>
+<li>
+          Single-character-ERE duplication <tt class="computeroutput"><span class="special">*</span>
+          <span class="special">+</span> <span class="special">?</span> <span class="special">{</span><span class="identifier">m</span><span class="special">,</span><span class="identifier">n</span><span class="special">}</span></tt>
+</li>
+<li>
+          Concatenation
+        </li>
+<li>
+          Anchoring ^$
+        </li>
+<li>
+          Alternation |
+        </li>
+</ol></div>
+<a name="boost_regex.syntax.perl_syntax.what_gets_matched"></a><h3>
+<a name="id469111"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.what_gets_matched">What gets
+        matched</a>
+      </h3>
+<p>
+        If you view the regular expression as a directed (possibly cyclic) graph,
+        then the best match found is the first match found by a depth-first-search
+        performed on that graph, while matching the input text.
+      </p>
+<p>
+        Alternatively:
+      </p>
+<p>
+        The best match found is the <a href="leftmost_longest_rule.html" title=" The Leftmost
+      Longest Rule">leftmost
+        match</a>, with individual elements matched as follows;
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Construct
+              </p>
+              </th>
+<th>
+              <p>
+                What gets matched
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">AtomA</span> <span class="identifier">AtomB</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Locates the best match for <span class="emphasis"><em>AtomA</em></span> that has a
+                following match for <span class="emphasis"><em>AtomB</em></span>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">Expression1</span> <span class="special">|</span>
+                <span class="identifier">Expression2</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                If <span class="emphasis"><em>Expresion1</em></span> can be matched then returns that
+                match, otherwise attempts to match <span class="emphasis"><em>Expression2</em></span>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="identifier">N</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches <span class="emphasis"><em>S</em></span> repeated exactly N times.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="identifier">N</span><span class="special">,</span><span class="identifier">M</span><span class="special">}</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches S repeated between N and M times, and as many times as possible.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="identifier">N</span><span class="special">,</span><span class="identifier">M</span><span class="special">}?</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches S repeated between N and M times, and as few times as possible.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">?,</span>
+                <span class="identifier">S</span><span class="special">*,</span>
+                <span class="identifier">S</span><span class="special">+</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The same as <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="number">0</span><span class="special">,</span><span class="number">1</span><span class="special">}</span></tt>,
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="number">0</span><span class="special">,</span><span class="identifier">UINT_MAX</span><span class="special">}</span></tt>,
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="number">1</span><span class="special">,</span><span class="identifier">UINT_MAX</span><span class="special">}</span></tt>
+                respectively.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">??,</span>
+                <span class="identifier">S</span><span class="special">*?,</span>
+                <span class="identifier">S</span><span class="special">+?</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                The same as <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="number">0</span><span class="special">,</span><span class="number">1</span><span class="special">}?</span></tt>,
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="number">0</span><span class="special">,</span><span class="identifier">UINT_MAX</span><span class="special">}?</span></tt>,
+                <tt class="computeroutput"><span class="identifier">S</span><span class="special">{</span><span class="number">1</span><span class="special">,</span><span class="identifier">UINT_MAX</span><span class="special">}?</span></tt>
+                respectively.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(?&gt;</span><span class="identifier">S</span><span class="special">)</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches the best match for <span class="emphasis"><em>S</em></span>, and only that.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(?=</span><span class="identifier">S</span><span class="special">),</span> <span class="special">(?&lt;=</span><span class="identifier">S</span><span class="special">)</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Matches only the best match for <span class="emphasis"><em>S</em></span> (this is only
+                visible if there are capturing parenthesis within <span class="emphasis"><em>S</em></span>).
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(?!</span><span class="identifier">S</span><span class="special">),</span> <span class="special">(?&lt;!</span><span class="identifier">S</span><span class="special">)</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                Considers only whether a match for S exists or not.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <tt class="computeroutput"><span class="special">(?(</span><span class="identifier">condition</span><span class="special">)</span><span class="identifier">yes</span><span class="special">-</span><span class="identifier">pattern</span>
+                <span class="special">|</span> <span class="identifier">no</span><span class="special">-</span><span class="identifier">pattern</span><span class="special">)</span></tt>
+              </p>
+              </td>
+<td>
+              <p>
+                If condition is true, then only yes-pattern is considered, otherwise
+                only no-pattern is considered.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_regex.syntax.perl_syntax.variations"></a><h3>
+<a name="id470029"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.variations">Variations</a>
+      </h3>
+<p>
+        The <a href="../ref/syntax_option_type/syntax_option_type_perl.html" title="
+        Options for Perl Regular Expressions">options
+        <tt class="computeroutput"><span class="identifier">normal</span></tt>, <tt class="computeroutput"><span class="identifier">ECMAScript</span></tt>,
+        <tt class="computeroutput"><span class="identifier">JavaScript</span></tt> and <tt class="computeroutput"><span class="identifier">JScript</span></tt></a> are all synonyms for <tt class="computeroutput"><span class="identifier">perl</span></tt>.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.options"></a><h3>
+<a name="id470124"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.options">Options</a>
+      </h3>
+<p>
+        There are a <a href="../ref/syntax_option_type/syntax_option_type_perl.html" title="
+        Options for Perl Regular Expressions">variety
+        of flags</a> that may be combined with the <tt class="computeroutput"><span class="identifier">perl</span></tt>
+        option when constructing the regular expression, in particular note that
+        the <tt class="computeroutput"><span class="identifier">newline_alt</span></tt> option alters
+        the syntax, while the <tt class="computeroutput"><span class="identifier">collate</span></tt>,
+        <tt class="computeroutput"><span class="identifier">nosubs</span></tt> and <tt class="computeroutput"><span class="identifier">icase</span></tt> options modify how the case and locale
+        sensitivity are to be applied.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.pattern_modifiers"></a><h3>
+<a name="id470227"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.pattern_modifiers">Pattern
+        Modifiers</a>
+      </h3>
+<p>
+        The perl <tt class="computeroutput"><span class="identifier">smix</span></tt> modifiers can
+        either be applied using a <tt class="computeroutput"><span class="special">(?</span><span class="identifier">smix</span><span class="special">-</span><span class="identifier">smix</span><span class="special">)</span></tt> prefix to the regular expression, or with
+        one of the <a href="../ref/syntax_option_type/syntax_option_type_perl.html" title="
+        Options for Perl Regular Expressions">regex-compile
+        time flags <tt class="computeroutput"><span class="identifier">no_mod_m</span></tt>, <tt class="computeroutput"><span class="identifier">mod_x</span></tt>, <tt class="computeroutput"><span class="identifier">mod_s</span></tt>,
+        and <tt class="computeroutput"><span class="identifier">no_mod_s</span></tt></a>.
+      </p>
+<a name="boost_regex.syntax.perl_syntax.references"></a><h3>
+<a name="id470356"></a>
+        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.references">References</a>
+      </h3>
+<p>
+        <a href="http://perldoc.perl.org/perlre.html" target="_top">Perl 5.8</a>.
+      </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="../syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="basic_extended.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/boost_regex/unicode.html b/doc/html/boost_regex/unicode.html
new file mode 100644
index 00000000..0c0fdc7f
--- /dev/null
+++ b/doc/html/boost_regex/unicode.html
@@ -0,0 +1,86 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title> Unicode and Boost.Regex</title>
+<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="../index.html" title="Boost.Regex">
+<link rel="up" href="../index.html" title="Boost.Regex">
+<link rel="prev" href="introduction_and_overview.html" title="Introduction and
+    Overview">
+<link rel="next" href="captures.html" title=" Understanding Marked Sub-Expressions
+    and Captures">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="introduction_and_overview.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="captures.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_regex.unicode"></a><a href="unicode.html" title=" Unicode and Boost.Regex"> Unicode and Boost.Regex</a></h2></div></div></div>
+<p>
+      There are two ways to use Boost.Regex with Unicode strings:
+    </p>
+<a name="boost_regex.unicode.rely_on_wchar_t"></a><h4>
+<a name="id458749"></a>
+      <a href="unicode.html#boost_regex.unicode.rely_on_wchar_t">Rely on wchar_t</a>
+    </h4>
+<p>
+      If your platform's <tt class="computeroutput"><span class="keyword">wchar_t</span></tt> type
+      can hold Unicode strings, and your platform's C/C++ runtime correctly handles
+      wide character constants (when passed to <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">iswspace</span></tt>
+      <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">iswlower</span></tt> etc), then you can use <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">wregex</span></tt>
+      to process Unicode. However, there are several disadvantages to this approach:
+    </p>
+<div class="itemizedlist"><ul type="disc">
+<li>
+        It's not portable: there's no guarantee on the width of <tt class="computeroutput"><span class="keyword">wchar_t</span></tt>,
+        or even whether the runtime treats wide characters as Unicode at all, most
+        Windows compilers do so, but many Unix systems do not.
+      </li>
+<li>
+        There's no support for Unicode-specific character classes: <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">Nd</span><span class="special">:]]</span></tt>,
+        <tt class="computeroutput"><span class="special">[[:</span><span class="identifier">Po</span><span class="special">:]]</span></tt> etc.
+      </li>
+<li>
+        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.
+      </li>
+</ul></div>
+<a name="boost_regex.unicode.use_a_unicode_aware_regular_expression_type_"></a><h4>
+<a name="id458932"></a>
+      <a href="unicode.html#boost_regex.unicode.use_a_unicode_aware_regular_expression_type_">Use
+      a Unicode Aware Regular Expression Type.</a>
+    </h4>
+<p>
+      If you have the <a href="http://www.ibm.com/software/globalization/icu/" target="_top">ICU
+      library</a>, then Boost.Regex can be <a href="install.html#boost_regex.install.building_with_unicode_and_icu_support">configured
+      to make use of it</a>, and provide a distinct regular expression type (boost::u32regex),
+      that supports both Unicode specific character properties, and the searching
+      of text that is encoded in either UTF-8, UTF-16, or UTF-32. See: <a href="ref/non_std_strings/icu.html" title=" Working With
+        Unicode and ICU String Types">ICU
+      string class support</a>.
+    </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer"><small>Copyright © 2007 John Maddock<p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="introduction_and_overview.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="captures.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>
diff --git a/doc/html/index.html b/doc/html/index.html
new file mode 100644
index 00000000..cfe70342
--- /dev/null
+++ b/doc/html/index.html
@@ -0,0 +1,211 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Boost.Regex</title>
+<link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<link rel="start" href="index.html" title="Boost.Regex">
+<link rel="next" href="boost_regex/configuration.html" title=" Configuration">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../boost.png"></td>
+<td align="center"><a href="../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="../../../../people/people.htm">People</a></td>
+<td align="center"><a href="../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav"><a accesskey="n" href="boost_regex/configuration.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
+<div class="article" lang="en">
+<div class="titlepage">
+<div>
+<div><h2 class="title">
+<a name="boost_regex"></a>Boost.Regex</h2></div>
+<div><div class="authorgroup"><div class="author"><h3 class="author">
+<span class="firstname">John</span> <span class="surname">Maddock</span>
+</h3></div></div></div>
+<div><p class="copyright">Copyright © 2007 John Maddock</p></div>
+<div><div class="legalnotice">
+<a name="id385571"></a><p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p>
+</div></div>
+</div>
+<hr>
+</div>
+<div class="toc">
+<p><b>Table of Contents</b></p>
+<dl>
+<dt><span class="section"><a href="boost_regex/configuration.html"> Configuration</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/configuration/compiler.html"> Compiler Setup</a></span></dt>
+<dt><span class="section"><a href="boost_regex/configuration/locale.html"> Locale and traits
+      class selection</a></span></dt>
+<dt><span class="section"><a href="boost_regex/configuration/linkage.html"> Linkage Options</a></span></dt>
+<dt><span class="section"><a href="boost_regex/configuration/algorithm.html"> Algorithm Selection</a></span></dt>
+<dt><span class="section"><a href="boost_regex/configuration/tuning.html"> Algorithm Tuning</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/install.html"> Building and Installing the Library</a></span></dt>
+<dt><span class="section"><a href="boost_regex/introduction_and_overview.html">Introduction and
+    Overview</a></span></dt>
+<dt><span class="section"><a href="boost_regex/unicode.html"> Unicode and Boost.Regex</a></span></dt>
+<dt><span class="section"><a href="boost_regex/captures.html"> Understanding Marked Sub-Expressions
+    and Captures</a></span></dt>
+<dt><span class="section"><a href="boost_regex/partial_matches.html"> Partial Matches</a></span></dt>
+<dt><span class="section"><a href="boost_regex/syntax.html"> Regular Expression Syntax</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/syntax/perl_syntax.html"> Perl Regular Expression
+      Syntax</a></span></dt>
+<dt><span class="section"><a href="boost_regex/syntax/basic_extended.html"> POSIX Extended Regular
+      Expression Syntax</a></span></dt>
+<dt><span class="section"><a href="boost_regex/syntax/basic_syntax.html"> POSIX Basic Regular
+      Expression Syntax</a></span></dt>
+<dt><span class="section"><a href="boost_regex/syntax/character_classes.html"> Character Class
+      Names</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/syntax/character_classes/std_char_clases.html">
+        Character Classes that are Always Supported</a></span></dt>
+<dt><span class="section"><a href="boost_regex/syntax/character_classes/optional_char_class_names.html">
+        Character classes that are supported by Unicode Regular Expressions</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/syntax/collating_names.html"> Collating Names</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/syntax/collating_names/digraphs.html"> Digraphs</a></span></dt>
+<dt><span class="section"><a href="boost_regex/syntax/collating_names/posix_symbolic_names.html">
+        POSIX Symbolic Names</a></span></dt>
+<dt><span class="section"><a href="boost_regex/syntax/collating_names/named_unicode.html">
+        Named Unicode Characters</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/syntax/leftmost_longest_rule.html"> The Leftmost
+      Longest Rule</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/format.html"> Search and Replace Format String Syntax</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/format/sed_format.html"> Sed Format String Syntax</a></span></dt>
+<dt><span class="section"><a href="boost_regex/format/perl_format.html"> Perl Format String Syntax</a></span></dt>
+<dt><span class="section"><a href="boost_regex/format/boost_format_syntax.html"> Boost-Extended
+      Format String Syntax</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/ref.html"> Reference</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/ref/basic_regex.html"> basic_regex</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/match_results.html"> match_results</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/sub_match.html"> sub_match</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/regex_match.html"> regex_match</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/regex_search.html"> regex_search</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/regex_replace.html"> regex_replace</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/regex_iterator.html"> regex_iterator</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/regex_token_iterator.html"> regex_token_iterator</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/bad_expression.html"> bad_expression</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/syntax_option_type.html"> syntax_option_type</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html">
+        syntax_option_type Synopsis</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/syntax_option_type/syntax_option_type_overview.html">
+        Overview of syntax_option_type</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/syntax_option_type/syntax_option_type_perl.html">
+        Options for Perl Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/syntax_option_type/syntax_option_type_extended.html">
+        Options for POSIX Extended Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/syntax_option_type/syntax_option_type_basic.html">
+        Options for POSIX Basic Regular Expressions</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/syntax_option_type/syntax_option_type_literal.html">
+        Options for Literal Strings</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/ref/match_flag_type.html"> match_flag_type</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/error_type.html"> error_type</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/regex_traits.html"> regex_traits</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings.html"> Interfacing With Non-Standard
+      String Types</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/icu.html"> Working With
+        Unicode and ICU String Types</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/icu/intro.html"> Introduction
+          to using Regex with ICU</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/icu/unicode_types.html">
+          Unicode regular expression types</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/icu/unicode_algo.html">
+          Unicode Regular Expression Algorithms</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/icu/unicode_iter.html">
+          Unicode Aware Regex Iterators</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/mfc_strings.html"> Using
+        Boost Regex With MFC Strings</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html">
+          Introduction to Boost.Regex and MFC Strings</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html">
+          Regex Types Used With MFC Strings</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html">
+          Regular Expression Creation From an MFC String</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html">
+          Overloaded Algorithms For MFC String Types</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html">
+          Iterating Over the Matches Within An MFC String</a></span></dt>
+</dl></dd>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/ref/posix.html"> POSIX Compatible C API's</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/concepts.html"> Concepts</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/ref/concepts/charT_concept.html"> charT Requirements</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/concepts/traits_concept.html"> Traits Class
+        Requirements</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/concepts/iterator_concepts.html"> Iterator
+        Rrequirements</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/ref/deprecated_interfaces.html">Deprecated Interfaces</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/ref/deprecated_interfaces/regex_format.html">
+        regex_format (Deprecated)</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/deprecated_interfaces/regex_grep.html">
+        regex_grep (Deprecated)</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/deprecated_interfaces/regex_split.html">
+        regex_split (deprecated)</a></span></dt>
+<dt><span class="section"><a href="boost_regex/ref/deprecated_interfaces/old_regex.html"> High
+        Level Class RegEx (Deprecated)</a></span></dt>
+</dl></dd>
+</dl></dd>
+<dt><span class="section"><a href="boost_regex/background_information.html">Background Information</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_regex/background_information/headers.html"> Headers</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/locale.html"> Localization</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/thread_safety.html"> Thread
+      Safety</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/examples.html"> Test and
+      Example Programs</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/futher.html"> References
+      and Further Information</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/faq.html"> FAQ</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/performance.html"> Performance</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/standards.html"> Standards
+      Conformance</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/redist.html"> Redistributables</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/acknowledgements.html">
+      Acknowledgements</a></span></dt>
+<dt><span class="section"><a href="boost_regex/background_information/history.html"> History</a></span></dt>
+</dl></dd>
+</dl>
+</div>
+<p>
+  </p>
+<p>
+  </p>
+<p>
+  </p>
+<p>
+  </p>
+<p>
+  </p>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"><p><small>Last revised: November 07, 2007 at 02:57:53 GMT</small></p></td>
+<td align="right"><div class="copyright-footer"><small></small></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav"><a accesskey="n" href="boost_regex/configuration.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
+</body>
+</html>
diff --git a/doc/icu_strings.html b/doc/icu_strings.html
deleted file mode 100644
index 39548198..00000000
--- a/doc/icu_strings.html
+++ /dev/null
@@ -1,468 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Working With Unicode and ICU String Types</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Working With Unicode and ICU String Types.</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#introduction">Introduction</a></dt> 
-         <dt><a href="#types">Unicode regular expression types</a></dt> 
-         <dt><a href="#algo">Regular Expression Algorithms</a>
-            <dd>
-               <dl class="index">
-                  <dt><a href="#u32regex_match">u32regex_match</a></dt> 
-                  <dt><a href="#u32regex_search">u32regex_search</a></dt> 
-                  <dt><a href="#u32regex_replace">u32regex_replace</a></dt> 
-               </dl>
-            </dd>
-         </dt>
-         <dt><a href="#iterators">Iterators</a>
-            <dd>
-               <dl class="index">
-                  <dt><a href="#u32regex_iterator">u32regex_iterator</a></dt> 
-                  <dt><a href="#u32regex_token_iterator">u32regex_token_iterator</a></dt> 
-               </dl>
-            </dd>
-         </dt>
-      </dl>
-      <H3><A name="introduction"></A>Introduction</H3>
-      <P>The header:</P>
-      <PRE>&lt;boost/regex/icu.hpp&gt;</PRE>
-      <P>contains the data types and algorithms necessary for working with regular 
-         expressions in a Unicode aware environment.&nbsp;
-      </P>
-      <P>In order to use this header you will need <A href="http://www.ibm.com/software/globalization/icu/">
-            the ICU library</A>, and you will need to have built the Boost.Regex library 
-         with <A href="install.html#unicode">ICU support enabled</A>.</P>
-      <P>The header will enable you to:</P>
-      <UL>
-         <LI>
-         Create regular expressions that treat Unicode strings as sequences of UTF-32 
-         code points.
-         <LI>
-         Create regular expressions that support various Unicode data properties, 
-         including character classification.
-         <LI>
-            Transparently search Unicode strings that are encoded as either UTF-8, UTF-16 
-            or UTF-32.</LI></UL>
-      <H3><A name="types"></A>Unicode regular expression types</H3>
-      <P>Header &lt;boost/regex/icu.hpp&gt; provides a regular expression&nbsp;traits 
-         class that handles UTF-32 characters:</P>
-      <PRE>class icu_regex_traits;</PRE>
-      <P>and a regular expression type based upon that:</P>
-      <PRE>typedef basic_regex&lt;UChar32,icu_regex_traits&gt; u32regex;</PRE>
-      <P>The type <EM>u32regex</EM> is regular expression type to use for all Unicode 
-         regular expressions; internally it uses UTF-32 code points, but can be created 
-         from, and used to search, either UTF-8, or UTF-16 encoded strings as well as 
-         UTF-32 ones.</P>
-      <P>The <A href="basic_regex.html#c2">constructors</A>, and <A href="basic_regex.html#a1">
-            assign</A> member functions of u32regex, require UTF-32 encoded strings, but 
-         there are a series of overloaded algorithms called make_u32regex which allow 
-         regular expressions to be created from UTF-8, UTF-16, or UTF-32 encoded 
-         strings:</P>
-      <PRE>template &lt;class InputIterator&gt; 
-u32regex make_u32regex(InputIterator i, InputIterator j, boost::regex_constants::syntax_option_type opt);
-</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the iterator 
-         sequence [i,j). The character encoding of the sequence is determined based upon <code>
-            sizeof(*i)</code>: 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.</P>
-      <PRE>u32regex make_u32regex(const char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);
-</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated UTF-8 characater sequence <EM>p</EM>.</P>
-      <PRE>u32regex make_u32regex(const unsigned char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated UTF-8 characater sequence <EM>p</EM>.u32regex 
-         make_u32regex(const wchar_t* p, boost::regex_constants::syntax_option_type opt 
-         = boost::regex_constants::perl);</P>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated characater sequence <EM>p</EM>.&nbsp; The character encoding of 
-         the sequence is determined based upon <CODE>sizeof(wchar_t)</CODE>: 1 implies 
-         UTF-8, 2 implies UTF-16, and 4 implies UTF-32.</P>
-      <PRE>u32regex make_u32regex(const UChar* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the 
-         Null-terminated UTF-16 characater sequence <EM>p</EM>.</P>
-      <PRE>template&lt;class C, class T, class A&gt;
-u32regex make_u32regex(const std::basic_string&lt;C, T, A&gt;&amp; s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the string <EM>s</EM>.&nbsp; 
-         The character encoding of the string is determined based upon <CODE>sizeof(C)</CODE>: 
-         1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.</P>
-      <PRE>u32regex make_u32regex(const UnicodeString&amp; s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl);</PRE>
-      <P><STRONG>Effects:</STRONG> Creates a regular expression object from the UTF-16 
-         encoding string <EM>s</EM>.</P>
-      <H3><A name="algo"></A>Regular Expression Algorithms</H3>
-      <P>The regular expression algorithms <A href="regex_match.html">regex_match</A>, <A href="regex_search.html">
-            regex_search</A> and <A href="regex_replace.html">regex_replace</A> all 
-         expect that the character sequence upon which they operate, is encoded in the 
-         same character encoding as the regular expression object with which they are 
-         used.&nbsp; For Unicode regular expressions that behavior is undesirable: while 
-         we may want to process the data in UTF-32 "chunks", the actual data is much 
-         more likely to encoded as either UTF-8 or UTF-16.&nbsp; Therefore the header 
-         &lt;boost/regex/icu.hpp&gt; provides a series of thin wrappers around these 
-         algorithms, called u32regex_match, u32regex_search, and u32regex_replace.&nbsp; 
-         These wrappers use iterator-adapters internally to make external UTF-8 or 
-         UTF-16 data look as though it's really a UTF-32 sequence, that can then be 
-         passed on to the "real" algorithm.</P>
-      <H4><A name="u32regex_match"></A>u32regex_match</H4>
-      <P>For each <A href="regex_match.html">regex_match</A> algorithm defined by 
-         &lt;boost/regex.hpp&gt;, then &lt;boost/regex/icu.hpp&gt; defines an overloaded 
-         algorithm that takes the same arguments, but which is called <EM>u32regex_match</EM>, 
-         and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an 
-         ICU&nbsp;UnicodeString as input.</P>
-      <P><STRONG>Example: </STRONG>match a password, encoded in a UTF-16 UnicodeString:</P>
-      <PRE>//
-// Find out if *password* meets our password requirements,
-// as defined by the regular expression *requirements*.
-//
-bool is_valid_password(const UnicodeString&amp; password, const UnicodeString&amp; requirements)
-{
-   return boost::u32regex_match(password, boost::make_u32regex(requirements));
-}
-</PRE>
-      <P>
-      <P><STRONG>Example: </STRONG>match a UTF-8 encoded filename:</P>
-      <PRE>//
-// 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&amp; path)
-{
-   boost::u32regex r = boost::make_u32regex("(?:\\A|.*\\\\)([^\\\\]+)");
-   boost::smatch what;
-   if(boost::u32regex_match(path, what, r))
-   {
-      // extract $1 as a CString:
-      return what.str(1);
-   }
-   else
-   {
-      throw std::runtime_error("Invalid pathname");
-   }
-}
-</PRE>
-      <H4><A name="u32regex_search"></A>u32regex_search</H4>
-      <P>For each <A href="regex_search.html">regex_search</A> algorithm defined by 
-         &lt;boost/regex.hpp&gt;, then &lt;boost/regex/icu.hpp&gt; defines an overloaded 
-         algorithm that takes the same arguments, but which is called <EM>u32regex_search</EM>, 
-         and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an 
-         ICU&nbsp;UnicodeString as input.</P>
-      <P><STRONG>Example: </STRONG>search for a character sequence in a specific 
-         language block:
-      </P>
-      <PRE>UnicodeString extract_greek(const UnicodeString&amp; 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(L"[\\x{370}-\\x{3FF}](?:[^[:L*:]]|[\\x{370}-\\x{3FF}])*");
-   boost::u16match what;
-   if(boost::u32regex_search(text, what, r))
-   {
-      // extract $0 as a CString:
-      return UnicodeString(what[0].first, what.length(0));
-   }
-   else
-   {
-      throw std::runtime_error("No Greek found!");
-   }
-}</PRE>
-      <H4><A name="u32regex_replace"></A>u32regex_replace</H4>
-      <P>For each <A href="regex_replace.html">regex_replace</A> algorithm defined by 
-         &lt;boost/regex.hpp&gt;, then &lt;boost/regex/icu.hpp&gt; defines an overloaded 
-         algorithm that takes the same arguments, but which is called <EM>u32regex_replace</EM>, 
-         and which will accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an 
-         ICU&nbsp;UnicodeString as input.&nbsp; The input sequence and the format string 
-         specifier passed to the algorithm, can be encoded independently (for example 
-         one can be UTF-8, the other in UTF-16), but the result string / output iterator 
-         argument must use the same character encoding as the text being searched.</P>
-      <P><STRONG>Example: </STRONG>Credit card number reformatting:</P>
-      <PRE>//
-// 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";
-
-UnicodeString human_readable_card_number(const UnicodeString&amp; s)
-{
-   return boost::u32regex_replace(s, e, human_format);
-}</PRE>
-      <P>
-         <H2><A name="iterators"></A>Iterators</H2>
-         <H3><A name="u32regex_iterator"></A>u32regex_iterator</H3>
-      <P>Type u32regex_iterator is in all respects the same as <A href="regex_iterator.html">
-            regex_iterator</A> except that since the regular expression type is always 
-         u32regex it only takes one template parameter (the iterator type). It also 
-         calls u32regex_search internally, allowing it to interface correctly with 
-         UTF-8, UTF-16, and UTF-32 data:</P>
-      <PRE>
-template &lt;class BidirectionalIterator&gt;
-class u32regex_iterator
-{
-   // for members see <A href="regex_iterator.html">regex_iterator</A>
-};
-
-typedef u32regex_iterator&lt;const char*&gt;     utf8regex_iterator;
-typedef u32regex_iterator&lt;const UChar*&gt;    utf16regex_iterator;
-typedef u32regex_iterator&lt;const UChar32*&gt;  utf32regex_iterator;
-</PRE>
-      <P>In order to simplify the construction of a u32regex_iterator from a string, 
-         there are a series of non-member helper functions called 
-         make_u32regex_iterator:</P>
-      <PRE>
-u32regex_iterator&lt;const char*&gt; 
-   make_u32regex_iterator(const char* s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-u32regex_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_iterator(const wchar_t* s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-u32regex_iterator&lt;const UChar*&gt; 
-   make_u32regex_iterator(const UChar* s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-template &lt;class charT, class Traits, class Alloc&gt;
-u32regex_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);
-                          
-u32regex_iterator&lt;const UChar*&gt; 
-   make_u32regex_iterator(const UnicodeString&amp; s, 
-                          const u32regex&amp; e, 
-                          regex_constants::match_flag_type m = regex_constants::match_default);</PRE>
-      <P>
-      <P>Each of these overloads returns an iterator that enumerates all occurrences of 
-         expression <EM>e</EM>, in text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <P><STRONG>Example</STRONG>: search for international currency symbols, along with 
-         their associated numeric value:</P>
-      <PRE>
-void enumerate_currencies(const std::string&amp; text)
-{
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
-      "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
-      "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
-      "(?(1)"
-         "|(?(2)"
-            "[[:Cf:][:Cc:][:Z*:]]*"
-         ")"
-         "[[:Sc:]]"
-      ")";
-   boost::u32regex r = boost::make_u32regex(re);
-   boost::u32regex_iterator&lt;std::string::const_iterator&gt; i(boost::make_u32regex_iterator(text, r)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; (*i)[0] &lt;&lt; std::endl;
-      ++i;
-   }
-}</PRE>
-      <P>
-      <P>Calling
-      </P>
-      <PRE>enumerate_currencies(" $100.23 or £198.12 ");</PRE>
-      <P>Yields the output:</P>
-      <PRE>$100.23<BR>£198.12</PRE>
-      <P>Provided of course that the input is encoded as UTF-8.</P>
-      <H3><A name="u32regex_token_iterator"></A>u32regex_token_iterator</H3>
-      <P>Type u32regex_token_iterator is in all respects the same as <A href="regex_token_iterator.html">
-            regex_token_iterator</A> except that since the regular expression type is 
-         always u32regex it only takes one template parameter (the iterator type).&nbsp; 
-         It also calls u32regex_search internally, allowing it to interface correctly 
-         with UTF-8, UTF-16, and UTF-32 data:</P>
-      <PRE>template &lt;class BidirectionalIterator&gt;
-class u32regex_token_iterator
-{
-   // for members see <A href="regex_token_iterator.html">regex_token_iterator</A>
-};
-
-typedef u32regex_token_iterator&lt;const char*&gt;     utf8regex_token_iterator;
-typedef u32regex_token_iterator&lt;const UChar*&gt;    utf16regex_token_iterator;
-typedef u32regex_token_iterator&lt;const UChar32*&gt;  utf32regex_token_iterator;
-</PRE>
-      <P>In order to simplify the construction of a u32regex_token_iterator from a 
-         string, there are a series of non-member helper functions called 
-         make_u32regex_token_iterator:</P>
-      <PRE>
-u32regex_token_iterator&lt;const char*&gt; 
-   make_u32regex_token_iterator(const char* s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                               
-u32regex_token_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_token_iterator(const wchar_t* s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UChar* s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;class charT, class Traits, class Alloc&gt;
-u32regex_token_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_token_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UnicodeString&amp; s, 
-                                const u32regex&amp; e, 
-                                int sub, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);</PRE>
-      <P>
-      <P>Each of these overloads returns an iterator that enumerates all occurrences of 
-         marked sub-expression <EM>sub</EM> in regular expression&nbsp;<EM>e</EM>, found 
-         in text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <PRE>
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const char*&gt; 
-   make_u32regex_token_iterator(const char* p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_token_iterator(const wchar_t* p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UChar* p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;class charT, class Traits, class Alloc, std::size_t N&gt;
-u32regex_token_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_token_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; p, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;std::size_t N&gt;
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UnicodeString&amp; s, 
-                                const u32regex&amp; e, 
-                                const int (&amp;submatch)[N], 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P>Each of these overloads returns an iterator that enumerates one sub-expression 
-         for each&nbsp;<EM>submatch</EM> in regular expression&nbsp;<EM>e</EM>, found in 
-         text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <PRE>
-u32regex_token_iterator&lt;const char*&gt; 
-   make_u32regex_token_iterator(const char* p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const wchar_t*&gt; 
-   make_u32regex_token_iterator(const wchar_t* p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UChar* p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-template &lt;class charT, class Traits, class Alloc&gt;
-u32regex_token_iterator&lt;typename std::basic_string&lt;charT, Traits, Alloc&gt;::const_iterator&gt; 
-   make_u32regex_token_iterator(const std::basic_string&lt;charT, Traits, Alloc&gt;&amp; p, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-                                
-u32regex_token_iterator&lt;const UChar*&gt; 
-   make_u32regex_token_iterator(const UnicodeString&amp; s, 
-                                const u32regex&amp; e, 
-                                const std::vector&lt;int&gt;&amp; submatch, 
-                                regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P>Each of these overloads returns an iterator that enumerates one sub-expression 
-         for each&nbsp;<EM>submatch</EM> in regular expression&nbsp;<EM>e</EM>, found in 
-         text <EM>s</EM>, using match_flags <EM>m.</EM></P>
-      <P><STRONG>Example</STRONG>: search for international currency symbols, along with 
-         their associated numeric value:</P>
-      <PRE>
-void enumerate_currencies2(const std::string&amp; text)
-{
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
-      "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
-      "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
-      "(?(1)"
-         "|(?(2)"
-            "[[:Cf:][:Cc:][:Z*:]]*"
-         ")"
-         "[[:Sc:]]"
-      ")";
-   boost::u32regex r = boost::make_u32regex(re);
-   boost::u32regex_token_iterator&lt;std::string::const_iterator&gt; 
-      i(boost::make_u32regex_token_iterator(text, r, 1)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; *i &lt;&lt; std::endl;
-      ++i;
-   }
-}
-</PRE>
-      <P>
-         <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-         05 Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2005</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
-
diff --git a/doc/icu_strings.qbk b/doc/icu_strings.qbk
new file mode 100644
index 00000000..758f1d25
--- /dev/null
+++ b/doc/icu_strings.qbk
@@ -0,0 +1,484 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:icu Working With Unicode and ICU String Types]
+
+[section:intro Introduction to using Regex with ICU]
+
+The header:
+
+   <boost/regex/icu.hpp>
+
+contains the data types and algorithms necessary for working with regular 
+expressions in a Unicode aware environment. 
+
+In order to use this header you will need the 
+[@http://www.ibm.com/software/globalization/icu/ ICU library], and you will need 
+to have built the Boost.Regex library with 
+[link boost_regex.install.building_with_unicode_and_icu_support ICU support enabled].
+
+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.
+
+[endsect]
+
+[section:unicode_types Unicode regular expression types]
+
+Header `<boost/regex/icu.hpp>` provides a regular expression traits class that 
+handles UTF-32 characters:
+
+   class icu_regex_traits;
+
+and a regular expression type based upon that:
+
+   typedef basic_regex<UChar32,icu_regex_traits> u32regex;
+
+The type `u32regex` is regular expression type to use for all Unicode 
+regular expressions; internally it uses UTF-32 code points, but can be 
+created from, and used to search, either UTF-8, or UTF-16 encoded strings 
+as well as UTF-32 ones.
+
+The constructors, and assign member functions of `u32regex`, require UTF-32 
+encoded strings, but there are a series of overloaded algorithms called 
+`make_u32regex` which allow regular expressions to be created from 
+UTF-8, UTF-16, or UTF-32 encoded strings:
+
+   template <class InputIterator> 
+   u32regex make_u32regex(InputIterator i, 
+                          InputIterator j, 
+                          boost::regex_constants::syntax_option_type opt);
+
+[*Effects]: Creates a regular expression object from the iterator sequence \[i,j). 
+The character encoding of the sequence is determined based upon sizeof(*i): 
+1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.
+
+   u32regex make_u32regex(const char* p, 
+                          boost::regex_constants::syntax_option_type opt 
+                              = boost::regex_constants::perl);
+
+[*Effects]: Creates a regular expression object from the Null-terminated 
+UTF-8 characater sequence /p/.
+
+   u32regex make_u32regex(const unsigned char* p, 
+                          boost::regex_constants::syntax_option_type opt 
+                              = boost::regex_constants::perl);
+
+[*Effects]: Creates a regular expression object from the Null-terminated UTF-8 characater sequence p.
+
+   u32regex make_u32regex(const wchar_t* p, 
+                          boost::regex_constants::syntax_option_type opt 
+                              = boost::regex_constants::perl);
+
+[*Effects]: Creates a regular expression object from the Null-terminated characater sequence p.  The character encoding of the sequence is determined based upon sizeof(wchar_t): 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.
+
+   u32regex make_u32regex(const UChar* p, 
+                          boost::regex_constants::syntax_option_type opt 
+                              = boost::regex_constants::perl);
+
+[*Effects]: Creates a regular expression object from the Null-terminated UTF-16 characater sequence p.
+
+   template<class C, class T, class A>
+   u32regex make_u32regex(const std::basic_string<C, T, A>& s, 
+                          boost::regex_constants::syntax_option_type opt 
+                              = boost::regex_constants::perl);
+
+[*Effects]: Creates a regular expression object from the string s.  The character encoding of the string is determined based upon sizeof(C): 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32.
+
+   u32regex make_u32regex(const UnicodeString& s, 
+                          boost::regex_constants::syntax_option_type opt 
+                              = boost::regex_constants::perl);
+
+[*Effects]: Creates a regular expression object from the UTF-16 encoding string s.
+
+[endsect]
+
+[section:unicode_algo Unicode Regular Expression Algorithms]
+
+The regular expression algorithms [regex_match], [regex_search] and [regex_replace] 
+all expect that the character sequence upon which they operate, 
+is encoded in the same character encoding as the regular expression object 
+with which they are used.  For Unicode regular expressions that behavior is 
+undesirable: while we may want to process the data in UTF-32 "chunks", the 
+actual data is much more likely to encoded as either UTF-8 or UTF-16.  
+Therefore the header <boost/regex/icu.hpp> provides a series of thin wrappers 
+around these algorithms, called `u32regex_match`, `u32regex_search`, and 
+`u32regex_replace`.  These wrappers use iterator-adapters internally to 
+make external UTF-8 or UTF-16 data look as though it's really a UTF-32 sequence, 
+that can then be passed on to the "real" algorithm.
+
+[h4 u32regex_match]
+
+For each [regex_match] algorithm defined by `<boost/regex.hpp>`, then 
+`<boost/regex/icu.hpp>` defines an overloaded algorithm that takes the 
+same arguments, but which is called `u32regex_match`, and which will 
+accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an 
+ICU UnicodeString as input.
+
+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)
+   {
+      return boost::u32regex_match(password, boost::make_u32regex(requirements));
+   }
+
+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)
+   {
+      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);
+      }
+      else
+      {
+         throw std::runtime_error("Invalid pathname");
+      }
+   }
+
+[h4 u32regex_search]
+
+For each [regex_search] algorithm defined by `<boost/regex.hpp>`, then 
+`<boost/regex/icu.hpp>` defines an overloaded algorithm that takes the 
+same arguments, but which is called `u32regex_search`, and which will 
+accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an ICU 
+UnicodeString as input.
+
+Example: search for a character sequence in a specific language block:
+
+   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(
+            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));
+      }
+      else
+      {
+         throw std::runtime_error("No Greek found!");
+      }
+   }
+
+[h4 u32regex_replace]
+
+For each [regex_replace] algorithm defined by `<boost/regex.hpp>`, then 
+`<boost/regex/icu.hpp>` defines an overloaded algorithm that takes 
+the same arguments, but which is called `u32regex_replace`, and which will 
+accept UTF-8, UTF-16 or UTF-32 encoded data, as well as an ICU 
+UnicodeString as input.  The input sequence and the format string specifier 
+passed to the algorithm, can be encoded independently (for example one can 
+be UTF-8, the other in UTF-16), but the result string / output iterator 
+argument must use the same character encoding as the text being searched.
+
+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(
+         "\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
+   const char* human_format = "$1-$2-$3-$4";
+
+   UnicodeString human_readable_card_number(const UnicodeString& s)
+   {
+      return boost::u32regex_replace(s, e, human_format);
+   }
+
+[endsect]
+[section:unicode_iter Unicode Aware Regex Iterators]
+
+[h4 u32regex_iterator]
+
+Type `u32regex_iterator` is in all respects the same as [regex_iterator] 
+except that since the regular expression type is always `u32regex`
+it only takes one template parameter (the iterator type). It also calls 
+`u32regex_search` internally, allowing it to interface correctly with 
+UTF-8, UTF-16, and UTF-32 data:
+
+   template <class BidirectionalIterator>
+   class u32regex_iterator
+   {
+      // for members see regex_iterator
+   };
+
+   typedef u32regex_iterator<const char*>     utf8regex_iterator;
+   typedef u32regex_iterator<const UChar*>    utf16regex_iterator;
+   typedef u32regex_iterator<const UChar32*>  utf32regex_iterator;
+
+In order to simplify the construction of a `u32regex_iterator` from a string, 
+there are a series of non-member helper functions called make_u32regex_iterator:
+
+   u32regex_iterator<const char*> 
+      make_u32regex_iterator(const char* s, 
+                             const u32regex& e, 
+                             regex_constants::match_flag_type m = regex_constants::match_default);
+                             
+   u32regex_iterator<const wchar_t*> 
+      make_u32regex_iterator(const wchar_t* s, 
+                             const u32regex& e, 
+                             regex_constants::match_flag_type m = regex_constants::match_default);
+                             
+   u32regex_iterator<const UChar*> 
+      make_u32regex_iterator(const UChar* s, 
+                             const u32regex& e, 
+                             regex_constants::match_flag_type m = regex_constants::match_default);
+                             
+   template <class charT, class Traits, class Alloc>
+   u32regex_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator> 
+      make_u32regex_iterator(const std::basic_string<charT, Traits, Alloc>& s, 
+                             const u32regex& e, 
+                             regex_constants::match_flag_type m = regex_constants::match_default);
+                             
+   u32regex_iterator<const UChar*> 
+      make_u32regex_iterator(const UnicodeString& s, 
+                             const u32regex& e, 
+                             regex_constants::match_flag_type m = regex_constants::match_default);
+
+Each of these overloads returns an iterator that enumerates all occurrences 
+of expression /e/, in text /s/, using match_flags /m/.
+
+Example: search for international currency symbols, along with their associated numeric value:
+
+   void enumerate_currencies(const std::string& text)
+   {
+      // enumerate and print all the currency symbols, along
+      // with any associated numeric values:
+      const char* re = 
+         "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
+         "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
+         "(?(1)"
+            "|(?(2)"
+               "[[:Cf:][:Cc:][:Z*:]]*"
+            ")"
+            "[[:Sc:]]"
+         ")";
+      boost::u32regex r = boost::make_u32regex(re);
+      boost::u32regex_iterator<std::string::const_iterator> 
+            i(boost::make_u32regex_iterator(text, r)), j;
+      while(i != j)
+      {
+         std::cout << (*i)[0] << std::endl;
+         ++i;
+      }
+   }
+
+Calling
+
+[/this doesn't format correctly as code:]
+[pre enumerate_currencies(" $100.23 or '''&#xA3;'''198.12 ");]
+
+Yields the output:
+
+[pre
+$100.23
+'''&#xA3;'''198.12
+]
+
+Provided of course that the input is encoded as UTF-8.
+
+[h4 u32regex_token_iterator]
+
+Type `u32regex_token_iterator` is in all respects the same as [regex_token_iterator] 
+except that since the regular expression type is always `u32regex` it only 
+takes one template parameter (the iterator type).  It also calls 
+`u32regex_search` internally, allowing it to interface correctly with UTF-8, 
+UTF-16, and UTF-32 data:
+
+   template <class BidirectionalIterator>
+   class u32regex_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;
+   typedef u32regex_token_iterator<const UChar32*>  utf32regex_token_iterator;
+
+In order to simplify the construction of a `u32regex_token_iterator` from a string, 
+there are a series of non-member helper functions called `make_u32regex_token_iterator`:
+
+   u32regex_token_iterator<const char*> 
+      make_u32regex_token_iterator(
+            const char* s, 
+            const u32regex& e, 
+            int sub, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                  
+   u32regex_token_iterator<const wchar_t*> 
+      make_u32regex_token_iterator(
+            const wchar_t* s, 
+            const u32regex& e, 
+            int sub, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   u32regex_token_iterator<const UChar*> 
+      make_u32regex_token_iterator(
+            const UChar* s, 
+            const u32regex& e, 
+            int sub, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   template <class charT, class Traits, class Alloc>
+   u32regex_token_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator> 
+      make_u32regex_token_iterator(
+            const std::basic_string<charT, Traits, Alloc>& s, 
+            const u32regex& e, 
+            int sub, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   u32regex_token_iterator<const UChar*> 
+      make_u32regex_token_iterator(
+            const UnicodeString& s, 
+            const u32regex& e, 
+            int sub, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+
+Each of these overloads returns an iterator that enumerates all occurrences of 
+marked sub-expression sub in regular expression /e/, found in text /s/, using 
+match_flags /m/.
+
+   template <std::size_t N>
+   u32regex_token_iterator<const char*> 
+      make_u32regex_token_iterator(
+            const char* p, 
+            const u32regex& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   template <std::size_t N>
+   u32regex_token_iterator<const wchar_t*> 
+      make_u32regex_token_iterator(
+            const wchar_t* p, 
+            const u32regex& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   template <std::size_t N>
+   u32regex_token_iterator<const UChar*> 
+      make_u32regex_token_iterator(
+            const UChar* p, 
+            const u32regex& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   template <class charT, class Traits, class Alloc, std::size_t N>
+   u32regex_token_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator> 
+      make_u32regex_token_iterator(
+            const std::basic_string<charT, Traits, Alloc>& p, 
+            const u32regex& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   template <std::size_t N>
+   u32regex_token_iterator<const UChar*> 
+      make_u32regex_token_iterator(
+            const UnicodeString& s, 
+            const u32regex& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+
+Each of these overloads returns an iterator that enumerates one sub-expression 
+for each submatch in regular expression /e/, found in text /s/, using match_flags /m/.
+
+   u32regex_token_iterator<const char*> 
+      make_u32regex_token_iterator(
+            const char* p, 
+            const u32regex& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   u32regex_token_iterator<const wchar_t*> 
+      make_u32regex_token_iterator(
+            const wchar_t* p, 
+            const u32regex& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   u32regex_token_iterator<const UChar*> 
+      make_u32regex_token_iterator(
+            const UChar* p, 
+            const u32regex& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   template <class charT, class Traits, class Alloc>
+   u32regex_token_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator> 
+      make_u32regex_token_iterator(
+            const std::basic_string<charT, Traits, Alloc>& p, 
+            const u32regex& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                   
+   u32regex_token_iterator<const UChar*> 
+      make_u32regex_token_iterator(
+            const UnicodeString& s, 
+            const u32regex& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+
+Each of these overloads returns an iterator that enumerates one sub-expression for 
+each submatch in regular expression /e/, found in text /s/, using match_flags /m/.
+
+Example: search for international currency symbols, along with their associated numeric value:
+
+   void enumerate_currencies2(const std::string& text)
+   {
+      // enumerate and print all the currency symbols, along
+      // with any associated numeric values:
+      const char* re = 
+         "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
+         "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
+         "(?(1)"
+            "|(?(2)"
+               "[[:Cf:][:Cc:][:Z*:]]*"
+            ")"
+            "[[:Sc:]]"
+         ")";
+      boost::u32regex r = boost::make_u32regex(re);
+      boost::u32regex_token_iterator<std::string::const_iterator> 
+         i(boost::make_u32regex_token_iterator(text, r, 1)), j;
+      while(i != j)
+      {
+         std::cout << *i << std::endl;
+         ++i;
+      }
+   }
+
+[endsect]
+
+[endsect]
+
diff --git a/doc/implementation.html b/doc/implementation.html
deleted file mode 100644
index d2a9b5f2..00000000
--- a/doc/implementation.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Implementation</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Implementation</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Todo.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/index.html b/doc/index.html
deleted file mode 100644
index 1ff29559..00000000
--- a/doc/index.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Index</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <table summary="contains the boost libraries logo and a page header"
-			 id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Index</h2>
-            </td>
-            <td width="50">
-               <h3><a href="../../index.html"><img height="45" width="43" alt="Boost Libraries Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h2>Contents</h2>
-      <p>This documentation <a href="http://boost-consulting.com/vault/index.php?action=downloadfile&filename=boost_regex-1.34.pdf&directory=PDF%20Documentation&">is also available in PDF format</a>.</p>
-      <dl class="index">
-         <dt><a href="introduction.html">Overview</a> <dt><a href="configuration.html">Configuration 
-                  and setup</a> <dt><a href="install.html">Installation</a>
-                  <dd>
-                     <dl class="index">
-                        <dt><a href="install.html#bjam">Building with bjam (preferred)</a> 
-                        <dt><a href="install.html#unicode">Building with Unicode/ICU support</a>
-                        <dt><a href="install.html#make">Building via Makefiles</a> 
-                        <dd><dl class="index">
-                           <dt><a href="install.html#bcb">Borland C++ Builder</a> 
-                           <dt><a href="install.html#vc">Microsoft 
-                                    Visual C++</a> 
-                           <dt><a href="install.html#gcc">GNU G++</a> 
-                           <dt><a href="install.html#sun">
-                                          Sun Forte Compiler</a> 
-                           <dt><a href="install.html#other">Other compilers</a>
-													 </dt>
-                        </dl></dd>
-                     </dl>
-                     <dt>Backgrounders
-                        <dd>
-                           <dl class="index">
-                              <dt><a href="syntax.html">Regular Expression Syntax</a>
-                                 <dd>
-                                    <dl class="index">
-                                       <dt><a href="syntax_perl.html">Perl Regular Expressions</a></dt>
-                                       <dt><a href="syntax_extended.html">POSIX-Extended Regular Expressions</a></dt>
-                                       <dt><a href="syntax_basic.html">POSIX-Basic Regular Expressions</a></dt>
-                                    </dl>
-                                 </dd>
-                              <dt><a href="format_syntax.html">Format String Syntax</a>
-                                 <dd>
-                                    <dl class="index">
-                                       <dt><a href="format_perl_syntax.html">Perl Format Syntax</a></dt>
-                                       <dt><a href="format_sed_syntax.html">Sed Format Syntax</a></dt>
-                                       <dt><a href="format_boost_syntax.html">Boost-Extended Format Syntax</a></dt>
-                                    </dl>
-                                 </dd>
-                              <dt><a href="partial_matches.html">Partial matches: matches against incomplete or infinitely long texts</a> 
-                              <dt><a href="captures.html">Understanding Captures</a></dt>
-                              <dt><a href="unicode.html">Unicode Support (requires ICU)</a></dt>
-                              <dt><a href="non_standard_strings.html">Working With Non-Standard String Types</a></dt>
-                                 <dd>
-                                    <dl>
-                                       <dt><a href="mfc_strings.html">MFC/ATL Strings</a></dt>
-                                       <dt><a href="icu_strings.html">ICU Strings</a></dt>
-                                    </dl>
-                                 </dd>
-                           </dl>
-                        </dd>
-                     <dt>Reference
-                        <dd>
-                           <dl class="index">
-                              <dt>Types
-                                 <dd>
-                                    <dl class="index">
-                                       <dt><a href="syntax_option_type.html">syntax_option_type</a> <dt><a href="error_type.html">
-                                                error_type</a> <dt><a href="match_flag_type.html">match_flag_type</a> <dt><a href="bad_expression.html">
-                                                      class&nbsp;regex_error</a> <dt><a href="regex_traits.html">class regex_traits</a>
-                                                      <dt><a href="basic_regex.html">class template basic_regex</a> <dt><a href="sub_match.html">
-                                                               class template sub_match</a> <dt><a href="match_results.html">class template 
-                                                                  match_results</a></dt>
-                                    </dl>
-                                    <dt>Algorithms
-                                       <dd>
-                                          <dl class="index">
-                                             <dt><a href="regex_match.html">regex_match</a> <dt><a href="regex_search.html">regex_search</a>
-                                                   <dt><a href="regex_replace.html">regex_replace</a></dt>
-                                          </dl>
-                                          <dt>Iterators
-                                             <dd>
-                                                <dl class="index">
-                                                   <dt><a href="regex_iterator.html">regex_iterator</a> <dt><a href="regex_token_iterator.html">
-                                                            regex_token_iterator</a></dt>
-                                                </dl>
-                                                <dt>Typedefs
-                                                   <dd>
-                                                      <dl class="index">
-                                                         <dt><a href="basic_regex.html">regex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
-                                                            basic_regex&lt;char&gt; ] <dt><a href="basic_regex.html">wregex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
-                                                               = basic_regex&lt;wchar_t&gt; ] <dt><a href="match_results.html">cmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
-                                                                  = match_results&lt;const char*&gt; ] <dt><a href="match_results.html">wcmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
-                                                                     = match_results&lt;const wchar_t*&gt; ] <dt><a href="match_results.html">smatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
-                                                                        = match_results&lt;std::string::const_iterator&gt; ] <dt><a href="match_results.html">
-                                                                              wsmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
-                                                                           match_results&lt;std::wstring::const_iterator&gt; ] <dt><a href="regex_iterator.html">
-                                                                                 cregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const 
-                                                                              char*&gt;] <dt><a href="regex_iterator.html">wcregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
-                                                                                 = regex_iterator&lt;const wchar_t*&gt;] <dt><a href="regex_iterator.html">sregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
-                                                                                    = regex_iterator&lt;std::string::const_iterator&gt;] <dt><a href="regex_iterator.html">
-                                                                                          wsregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
-                                                                                       regex_iterator&lt;std::wstring::const_iterator&gt;] <dt><a href="regex_token_iterator.html">
-                                                                                             cregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
-                                                                                          regex_token_iterator&lt;const char*&gt;] <dt><a href="regex_token_iterator.html">wcregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
-                                                                                             = regex_token_iterator&lt;const wchar_t*&gt;] <dt><a href="regex_token_iterator.html">
-                                                                                                   sregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
-                                                                                                regex_token_iterator&lt;std::string::const_iterator&gt;] <dt><a href="regex_token_iterator.html">
-                                                                                                      wsregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
-                                                                                                   regex_token_iterator&lt;std::wstring::const_iterator&gt;]</dt>
-                                                      </dl>
-                                          <dt>Deprecated interfaces
-                                             <dd>
-                                                <dl class="index">
-                                             <dt><a href="posix_api.html">POSIX API Compatibility Functions</a> 
-                                                   <dt><a href="regbase.html">class regbase</a> <dt><a href="reg_expression.html">class 
-                                                            template reg_expression</a> <dt><a href="regex_grep.html">Algorithm regex_grep</a>
-                                                            <dt><a href="regex_format.html">Algorithm regex_format</a> <dt><a href="regex_merge.html">
-                                                                     Algorithm regex_merge</a> <dt><a href="regex_split.html">Algorithm regex_split</a>
-                                                                     <dt><a href="regex.html">class RegEx</a></dt>
-                                                </dl>
-                                             </dd>
-                           </dl>
-                           <dt><a href="faq.html">FAQ</a> <dt>Appendix
-                                 <dd>
-                                    <dl class="index">
-                                       <dt><a href="implementation.html">Implementation</a> <dt><a href="thread_safety.html">Thread 
-                                                Safety</a> <dt><a href="localisation.html">Localisation</a> <dt><a href="examples.html">
-                                                      Examples</a> <dt><a href="headers.html">Headers</a> <dt><a href="redistributables.html">
-                                                            Redistributables and Library Names</a> <dt><a href="standards.html">Standards 
-                                                               Conformance</a> <dt><a href="history.html">History</a> <dt><a href="performance.html">
-                                                                     Performance</a> <dt><a href="contacts.html">Contacts and Acknowledgements</a></dt>
-                                    </dl>
-                                 </dd>
-      </dl>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/install.html b/doc/install.html
deleted file mode 100644
index 4e4834c9..00000000
--- a/doc/install.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Installation</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Installation</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <P>When you extract the library from its zip file, you must preserve its internal 
-         directory structure (for example by using the -d option when extracting). If 
-         you didn't do that when extracting, then you'd better stop reading this, delete 
-         the files you just extracted, and try again!
-      </P>
-      <P>This library should not need configuring before use; most popular 
-         compilers/standard libraries/platforms are already supported "as is". If you do 
-         experience configuration problems, or just want to test the configuration with 
-         your compiler, then the process is the same as for all of boost; see the <A href="../../config/config.htm">
-            configuration library documentation</A>.</P>
-      <P>The library will encase all code inside namespace boost.
-      </P>
-      <P>Unlike some other template libraries, this library consists of a mixture of 
-         template code (in the headers) and static code and data (in cpp files). 
-         Consequently it is necessary to build the library's support code into a library 
-         or archive file before you can use it, instructions for specific platforms are 
-         as follows:
-      </P>
-      <H3><A name="bjam"></A>Building with bjam</H3>
-      <P>This is now the preferred method for building and installing this library, 
-         please refer to the <A href="../../../more/getting_started.html">getting started 
-            guide</A> for more information.</P>
-      <H3><A name="unicode"></A>Building With Unicode and ICU Support</H3>
-      <P>A default build of this library does not enable <A href="unicode.html">Unciode 
-            support</A> via ICU.&nbsp; There is no need to enable this support if you 
-         don't need it, but if you use ICU for your Unicode support already, and want to 
-         work with Unicode-aware regular expressions then read on.</P>
-      <P>Most of the information you will need is in the <A href="../../../more/getting_started.html">
-            getting started guide</A>, the only additional step you need to take is to 
-         tell bjam that you want Boost.Regex to use ICU and optionally to tell bjam 
-         where ICU is located.</P>
-      <P>If you're building on a Unix-like platform, and ICU is already installed in 
-         you're compilers search path (with an install&nbsp;prefix of /usr or /usr/local 
-         for example), then set the environment variable HAVE_ICU to enable ICU 
-         support.&nbsp; For example you might build with the command line:</P>
-      <PRE>bjam -sHAVE_ICU=1 --toolset=<A href="../../../more/getting_started/windows.html#toolset-name">toolset-name</A> install</PRE>
-      <P>If ICU is not already in your compilers path then you need to set the 
-         environment variable ICU_PATH to point to the route directory of your ICU 
-         installation, for example if ICU was installed to /usr/local/icu/3.3 you might 
-         use:</P>
-      <PRE>bjam -sICU_PATH=/usr/local/icu/3.3 --toolset=<A href="../../../more/getting_started/windows.html#toolset-name">toolset-name</A> install</PRE>
-      <P>Note that ICU is a C++ library just like Boost is, as such your copy of ICU 
-         must have been built with the same C++ compiler (and compiler version) that you 
-         are using to build Boost.&nbsp; <STRONG>Boost.Regex will not work correctly unless 
-            you ensure that this is the case:</STRONG> it is up to you to ensure that 
-         the version of ICU you are using is binary compatible with the toolset you use 
-         to build Boost.</P>
-      <H2><A name="make"></A>Building via makefiles</H2>
-      <H3><A name="bcb"></A>Borland C++ Builder:
-      </H3>
-      <UL>
-         <LI>
-         Open up a console window and change to the &lt;boost&gt;\libs\regex\build 
-         directory.
-         <LI>
-         Select the appropriate makefile (bcb4.mak for C++ Builder 4, bcb5.mak for C++ 
-         Builder 5, and bcb6.mak for C++ Builder 6).
-         <LI>
-            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:
-         </LI>
-      </UL>
-      <PRE>make -fbcb5.mak</PRE>
-      <P>The build process will build a variety of .lib and .dll files (the exact number 
-         depends upon the version of Borland's tools you are using) the .lib and dll 
-         files will be in a sub-directory called bcb4 or bcb5 depending upon the 
-         makefile used. To install the libraries into your development system use:</P>
-      <PRE>make -fbcb5.mak install</PRE>
-      <P>library files will be copied to &lt;BCROOT&gt;/lib and the dll's to 
-         &lt;BCROOT&gt;/bin, where &lt;BCROOT&gt; corresponds to the install path of 
-         your Borland C++ tools.
-      </P>
-      <P>You may also remove temporary files created during the build process (excluding 
-         lib and dll files) by using:</P>
-      <PRE>make -fbcb5.mak clean</PRE>
-      <P>Finally when you use regex++ it is only necessary for you to add the 
-         &lt;boost&gt; root director to your list of include directories for that 
-         project. It is not necessary for you to manually add a .lib file to the 
-         project; the headers will automatically select the correct .lib file for your 
-         build mode and tell the linker to include it. There is one caveat however: the 
-         library can not tell the difference between VCL and non-VCL enabled builds when 
-         building a GUI application from the command line, if you build from the command 
-         line with the 5.5 command line tools then you must define the pre-processor 
-         symbol _NO_VCL in order to ensure that the correct link libraries are selected: 
-         the C++ Builder IDE normally sets this automatically. Hint, users of the 5.5 
-         command line tools may want to add a -D_NO_VCL to bcc32.cfg in order to set 
-         this option permanently.
-      </P>
-      <P>If you would prefer to do a dynamic link to the regex libraries when using the 
-         dll runtime then define BOOST_REGEX_DYN_LINK (you must do this if you want to 
-         use boost.regex in multiple dll's), otherwise Boost.regex will be statically 
-         linked by default.&nbsp;</P>
-      <P>If you want to suppress automatic linking altogether (and supply your own 
-         custom build of the lib) then define BOOST_REGEX_NO_LIB.</P>
-      <P>If you are building with C++ Builder 6, you will find that 
-         &lt;boost/regex.hpp&gt; can not be used in a pre-compiled header (the actual 
-         problem is in &lt;locale&gt; which gets included by &lt;boost/regex.hpp&gt;), 
-         if this causes problems for you, then try defining BOOST_NO_STD_LOCALE when 
-         building, this will disable some features throughout boost, but may save you a 
-         lot in compile times!</P>
-      <H3><A name="vc"></A>Microsoft Visual C++ 6, 7, 7.1 and 8</H3>
-      <P>You need version 6 of MSVC to build this library. If you are using VC5 then you 
-         may want to look at one of the previous releases of this <A href="http://ourworld.compuserve.com/homepages/john_maddock/regexpp.htm">
-            library</A>
-      </P>
-      <P>Open up a command prompt, which has the necessary MSVC environment variables 
-         defined (for example by using the batch file Vcvars32.bat installed by the 
-         Visual Studio installation), and change to the &lt;boost&gt;\libs\regex\build 
-         directory.
-      </P>
-      <P>Select the correct makefile - vc6.mak for "vanilla" Visual C++ 6 or 
-         vc6-stlport.mak if you are using STLPort.</P>
-      <P>Invoke the makefile like this:</P>
-      <PRE>nmake -fvc6.mak</PRE>
-      <P>You will now have a collection of lib and dll files in a "vc6" subdirectory, to 
-         install these into your development system use:</P>
-      <PRE>nmake -fvc6.mak install</PRE>
-      <P>The lib files will be copied to your &lt;VC6&gt;\lib directory and the dll 
-         files to &lt;VC6&gt;\bin, where &lt;VC6&gt; is the root of your Visual C++ 6 
-         installation.</P>
-      <P>You can delete all the temporary files created during the build (excluding lib 
-         and dll files) using:</P>
-      <PRE>nmake -fvc6.mak clean </PRE>
-      <P>If you want to build with ICU support, then you need to pass the path to your 
-         ICU directory to the makefile, for example with:
-      </P>
-      <PRE>nmake ICU_PATH=c:\open-source\icu -fvc71.mak install</PRE>
-      <P>Finally when you use regex++ it is only necessary for you to add the 
-         &lt;boost&gt; root directory to your list of include directories for that 
-         project. It is not necessary for you to manually add a .lib file to the 
-         project; the headers will automatically select the correct .lib file for your 
-         build mode and tell the linker to include it.
-      </P>
-      <P>Note that if you want to dynamically link to the regex library when using the 
-         dynamic C++ runtime, define BOOST_REGEX_DYN_LINK when building your project.</P>
-      <P>If you want to add the source directly to your project then define 
-         BOOST_REGEX_NO_LIB to disable automatic library selection.</P>
-      <P>There are several important caveats to remember when using boost.regex with 
-         Microsoft's Compiler:</P>
-      <UL>
-         <LI>
-         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 is to 
-         use all optimization settings except /Oa. This problem is reported to affect 
-         some standard library code as well (in fact I'm not sure if the problem is with 
-         the regex code or the underlying standard library), so it's probably worthwhile 
-         applying this workaround in normal practice in any case.
-         <LI>
-         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.
-         <LI>
-         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).
-         <LI>
-            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.
-         </LI>
-      </UL>
-      <H3><A name="gcc"></A>GCC(2.95 and 3.x)
-      </H3>
-      <P>You can build with gcc using the normal boost Jamfile in 
-         &lt;boost&gt;/libs/regex/build, alternatively there is a conservative makefile 
-         for the g++ compiler. From the command prompt change to the 
-         &lt;boost&gt;/libs/regex/build directory and type:
-      </P>
-      <PRE>make -fgcc.mak </PRE>
-      <P>At the end of the build process you should have a gcc sub-directory containing 
-         release and debug versions of the library (libboost_regex.a and 
-         libboost_regex_debug.a). When you build projects that use regex++, you will 
-         need to add the boost install directory to your list of include paths and add 
-         &lt;boost&gt;/libs/regex/build/gcc/libboost_regex.a to your list of library 
-         files.
-      </P>
-      <P>There is also a makefile to build the library as a shared library:</P>
-      <PRE>make -fgcc-shared.mak</PRE>
-      <P>which will build libboost_regex.so and libboost_regex_debug.so.</P>
-      <P>Both of the these makefiles support the following environment variables:</P>
-      <P>ICU_PATH: tells the makefile to build with Unicode support, set to the path 
-         where your ICU installation is located, for example with: <code>make 
-            ICU_PATH=/usr/local install -fgcc.mak</code></P>
-      <P>CXXFLAGS: extra compiler options - note that this applies to both the debug and 
-         release builds.</P>
-      <P>INCLUDES: additional include directories.</P>
-      <P>LDFLAGS: additional linker options.</P>
-      <P>LIBS: additional library files.</P>
-      <P>For the more adventurous there is a configure script in 
-         &lt;boost&gt;/libs/config; see the <A href="../../config/config.htm">config 
-            library documentation</A>.</P>
-      <H3><A name="sun"></A>Sun Workshop 6.1</H3>
-      <P>There is a makefile for the sun (6.1) compiler (C++ version 3.12). From the 
-         command prompt change to the &lt;boost&gt;/libs/regex/build directory and type:
-      </P>
-      <PRE>dmake -f sunpro.mak </PRE>
-      <P>At the end of the build process you should have a sunpro sub-directory 
-         containing single and multithread versions of the library (libboost_regex.a, 
-         libboost_regex.so, libboost_regex_mt.a and libboost_regex_mt.so). When you 
-         build projects that use regex++, you will need to add the boost install 
-         directory to your list of include paths and add 
-         &lt;boost&gt;/libs/regex/build/sunpro/ to your library search path.
-      </P>
-      <P>Both of the these makefiles support the following environment variables:</P>
-      <P>CXXFLAGS: extra compiler options - note that this applies to both the single 
-         and multithreaded builds.</P>
-      <P>INCLUDES: additional include directories.</P>
-      <P>LDFLAGS: additional linker options.</P>
-      <P>LIBS: additional library files.</P>
-      <P>LIBSUFFIX: a suffix to mangle the library name with (defaults to nothing).</P>
-      <P>This makefile does not set any architecture specific options like -xarch=v9, 
-         you can set these by defining the appropriate macros, for example:</P>
-      <PRE>dmake CXXFLAGS="-xarch=v9" LDFLAGS="-xarch=v9" LIBSUFFIX="_v9" -f sunpro.mak</PRE>
-      <P>will build v9 variants of the regex library named libboost_regex_v9.a etc.</P>
-      <H3><A name="other"></A>Makefiles for Other compilers:
-      </H3>
-      <P>There is a generic makefile (<A href="../build/generic.mak">generic.mak</A> ) 
-         provided in &lt;boost-root&gt;/libs/regex/build - see that makefile for details 
-         of environment variables that need to be set before use.
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-         09 Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2005<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/install.qbk b/doc/install.qbk
new file mode 100644
index 00000000..016759f8
--- /dev/null
+++ b/doc/install.qbk
@@ -0,0 +1,254 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:install Building and Installing the Library]
+
+When you extract the library from its zip file, you must preserve its internal 
+directory structure (for example by using the -d option when extracting). If you 
+didn't do that when extracting, then you'd better stop reading this, delete the 
+files you just extracted, and try again!
+
+This library should not need configuring before use; most popular compilers\/standard 
+libraries\/platforms are already supported "as is". If you do experience configuration 
+problems, or just want to test the configuration with your compiler, then the 
+process is the same as for all of boost; see the 
+[@../../../config/index.html configuration library documentation].
+
+The library will encase all code inside namespace boost.
+
+Unlike some other template libraries, this library consists of a mixture of 
+template code (in the headers) and static code and data (in cpp files). 
+Consequently it is necessary to build the library's support code into a 
+library or archive file before you can use it, instructions for specific 
+platforms are as follows:
+
+[h4 Building with bjam]
+
+This is now the preferred method for building and installing this library, 
+please refer to the 
+[@../../../../more/getting_started.html getting started guide] for more information.
+
+[h4 Building With Unicode and ICU Support]
+
+A default build of this library does not enable Unciode support via ICU.  
+There is no need to enable this support if you don't need it, but if you 
+use ICU for your Unicode support already, and want to work with 
+Unicode-aware regular expressions then read on.
+
+Most of the information you will need is in the getting started guide, 
+the only additional step you need to take is to tell bjam that you want 
+Boost.Regex to use ICU and optionally to tell bjam where ICU is located.
+
+If you're building on a Unix-like platform, and ICU is already installed in 
+your compilers search path (with an install prefix of `/usr` or 
+`/usr/local` for example), then set the environment variable `HAVE_ICU` to 
+enable ICU support.  For example you might build with the command line:
+
+[pre bjam -sHAVE_ICU=1 --toolset=toolset-name install]
+
+If ICU is not already in your compiler's path then you need to set the 
+environment variable `ICU_PATH` to point to the root directory of your 
+ICU installation, for example if ICU was installed to `/usr/local/icu/3.3` you 
+might use:
+
+[pre bjam -sICU_PATH=/usr/local/icu/3.3 --toolset=toolset-name install]
+
+Note that ICU is a C++ library just like Boost is, as such your copy of 
+ICU must have been built with the same C++ compiler (and compiler version) 
+that you are using to build Boost.  Boost.Regex will not work correctly unless 
+you ensure that this is the case: it is up to you to ensure that the version 
+of ICU you are using is binary compatible with the toolset you use to build Boost.
+
+[h4 Building via makefiles]
+
+[h5 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:
+
+[pre make -fbcb5.mak]
+
+The build process will build a variety of .lib and .dll files (the exact number 
+depends upon the version of Borland's tools you are using) the .lib and dll 
+files will be in a sub-directory called bcb4 or bcb5 depending upon the 
+makefile used. To install the libraries into your development system use:
+
+[pre make -fbcb5.mak install]
+
+library files will be copied to `<BCROOT>/lib` and the dll's to `<BCROOT>/bin`, 
+where `<BCROOT>` corresponds to the install path of your Borland C++ tools.
+
+You may also remove temporary files created during the build process 
+(excluding lib and dll files) by using:
+
+[pre make -fbcb5.mak clean]
+
+Finally when you use Boost.Regex it is only necessary for you to add the 
+`<boost>` root director to your list of include directories for that project. 
+It is not necessary for you to manually add a .lib file to the project; 
+the headers will automatically select the correct .lib file for your build mode 
+and tell the linker to include it. There is one caveat however: the library 
+can not tell the difference between VCL and non-VCL enabled builds when building 
+a GUI application from the command line, if you build from the command line 
+with the 5.5 command line tools then you must define the pre-processor symbol 
+_NO_VCL in order to ensure that the correct link libraries are selected: the 
+C++ Builder IDE normally sets this automatically. Hint, users of the 
+5.5 command line tools may want to add a -D_NO_VCL to bcc32.cfg in order to 
+set this option permanently.
+
+If you would prefer to do a dynamic link to the regex libraries when using the 
+dll runtime then define BOOST_REGEX_DYN_LINK (you must do this if you want to 
+use Boost.Regex in multiple dll's), otherwise Boost.Regex will be statically 
+linked by default. 
+
+If you want to suppress automatic linking altogether (and supply your own 
+custom build of the lib) then define BOOST_REGEX_NO_LIB.
+
+If you are building with C++ Builder 6, you will find that `<boost/regex.hpp>` can 
+not be used in a pre-compiled header (the actual problem is in `<locale>` which 
+gets included by `<boost/regex.hpp>`), if this causes problems for you, 
+then try defining BOOST_NO_STD_LOCALE when building, this will disable some 
+features throughout boost, but may save you a lot in compile times!
+
+[h4 Microsoft Visual C++ 6, 7, 7.1 and 8]
+
+You need version 6 or later of MSVC to build this library. If you are using VC5 
+then you may want to look at one of the previous releases of this library.
+
+Open up a command prompt, which has the necessary MSVC environment variables 
+defined (for example by using the batch file Vcvars32.bat installed by the 
+Visual Studio installation), and change to the `<boost>\libs\regex\build directory`.
+
+Select the correct makefile - vc6.mak for "vanilla" Visual C++ 6 or 
+vc6-stlport.mak if you are using STLPort.
+
+Invoke the makefile like this:
+
+[pre nmake -fvc6.mak]
+
+You will now have a collection of lib and dll files in a "vc6" subdirectory, to 
+install these into your development system use:
+
+[pre nmake -fvc6.mak install]
+
+The lib files will be copied to your `<VC6>\lib` directory and the dll files to 
+`<VC6>\bin`, where `<VC6>` is the root of your Visual C++ 6 installation.
+
+You can delete all the temporary files created during the build (excluding lib and 
+dll files) using:
+
+[pre nmake -fvc6.mak clean ]
+
+If you want to build with ICU support, then you need to pass the path to your 
+ICU directory to the makefile, for example with:
+
+[pre nmake ICU_PATH=c:\open-source\icu -fvc71.mak install]
+
+Finally when you use Boost.Regex it is only necessary for you to add the 
+`<boost>` root directory to your list of include directories for that project. 
+It is not necessary for you to manually add a .lib file to the project; 
+the headers will automatically select the correct .lib file for your build mode 
+and tell the linker to include it.
+
+Note that if you want to dynamically link to the regex library when using the 
+dynamic C++ runtime, define BOOST_REGEX_DYN_LINK when building your project.
+
+If you want to add the source directly to your project then define 
+BOOST_REGEX_NO_LIB to disable automatic library selection.
+
+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 is to use all optimization settings 
+except /Oa. This problem is reported to affect some standard library code as well (
+in fact I'm not sure if the problem is with the regex code or the underlying standard library), 
+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.
+
+[h5 GCC(2.95 and later)]
+
+You can build with gcc using the normal boost Jamfile in `<boost>/libs/regex/build`, 
+alternatively there is a conservative makefile for the g++ compiler. From 
+the command prompt change to the <boost>/libs/regex/build directory and type:
+
+[pre make -fgcc.mak ]
+
+At the end of the build process you should have a gcc sub-directory containing 
+release and debug versions of the library (libboost_regex.a and libboost_regex_debug.a). When you build projects that use regex++, you will need to add the boost install directory to your list of include paths and add <boost>/libs/regex/build/gcc/libboost_regex.a to your list of library files.
+
+There is also a makefile to build the library as a shared library:
+
+[pre make -fgcc-shared.mak]
+
+which will build libboost_regex.so and libboost_regex_debug.so.
+
+Both of the these makefiles support the following environment variables:
+
+ICU_PATH: tells the makefile to build with Unicode support, set to the path where your ICU installation is located, for example with: make ICU_PATH=/usr/local install -fgcc.mak
+
+CXXFLAGS: extra compiler options - note that this applies to both the debug and release builds.
+
+INCLUDES: additional include directories.
+
+LDFLAGS: additional linker options.
+
+LIBS: additional library files.
+
+For the more adventurous there is a configure script in `<boost>/libs/config`; see 
+the [@../../../config/index.html config library documentation].
+
+[h5 Sun Workshop 6.1]
+
+There is a makefile for the sun (6.1) compiler (C++ version 3.12). From the command 
+prompt change to the `<boost>/libs/regex/build` directory and type:
+
+[pre dmake -f sunpro.mak ]
+
+At the end of the build process you should have a sunpro sub-directory containing single 
+and multithread versions of the library (libboost_regex.a, libboost_regex.so, 
+libboost_regex_mt.a and libboost_regex_mt.so). When you build projects that use 
+Boost.Regex, you will need to add the boost install directory to your list of 
+include paths and add `<boost>/libs/regex/build/sunpro/` to your library search path.
+
+Both of the these makefiles support the following environment variables:
+
+CXXFLAGS: extra compiler options - note that this applies to both the single and multithreaded builds.
+
+INCLUDES: additional include directories.
+
+LDFLAGS: additional linker options.
+
+LIBS: additional library files.
+
+LIBSUFFIX: a suffix to mangle the library name with (defaults to nothing).
+
+This makefile does not set any architecture specific options like -xarch=v9, you can set these by defining the appropriate macros, for example:
+
+[pre 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.
+
+[h5 Makefiles for Other compilers]
+
+There is a generic makefile (generic.mak ) provided in `<boost-root>/libs/regex/build`
+ - see that makefile for details of environment variables that need to be set 
+ before use. 
+
+[endsect]
+
diff --git a/doc/introduction.html b/doc/introduction.html
deleted file mode 100644
index 3a4fcc7c..00000000
--- a/doc/introduction.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Introduction</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Introduction</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Regular expressions are a form of pattern-matching that are often used in text 
-         processing; many users will be familiar with the Unix utilities <I>grep</I>, <I>sed</I>
-         and <I>awk</I>, and the programming language <I>Perl</I>, each of which make 
-         extensive use of regular expressions. Traditionally C++ users have been limited 
-         to the POSIX C API's for manipulating regular expressions, and while regex++ 
-         does provide these API's, they do not represent the best way to use the 
-         library. For example regex++ can cope with wide character strings, or search 
-         and replace operations (in a manner analogous to either sed or Perl), something 
-         that traditional C libraries can not do.</P>
-      <P>The class <A href="basic_regex.html">boost::basic_regex</A> is the key class in 
-         this library; it represents a "machine readable" regular expression, and is 
-         very closely modeled on std::basic_string, think of it as a string plus the 
-         actual state-machine required by the regular expression algorithms. Like 
-         std::basic_string there are two typedefs that are almost always the means by 
-         which this class is referenced:</P>
-      <pre><B>namespace </B>boost{
-
-<B>template</B> &lt;<B>class</B> charT, 
-<B>          class</B> traits = regex_traits&lt;charT&gt; &gt;
-<B>class</B> basic_regex;
-
-<B>typedef</B> basic_regex&lt;<B>char</B>&gt; regex;
-<B>typedef</B> basic_regex&lt;<B>wchar_t&gt;</B> wregex;
-
-}</pre>
-      <P>To see how this library can be used, imagine that we are writing a credit card 
-         processing application. Credit card numbers generally come as a string of 
-         16-digits, separated into groups of 4-digits, and separated by either a space 
-         or a hyphen. Before storing a credit card number in a database (not necessarily 
-         something your customers will appreciate!), we may want to verify that the 
-         number is in the correct format. To match any digit we could use the regular 
-         expression [0-9], however ranges of characters like this are actually locale 
-         dependent. Instead we should use the POSIX standard form [[:digit:]], or the 
-         regex++ and Perl shorthand for this \d (note that many older libraries tended 
-         to be hard-coded to the C-locale, consequently this was not an issue for them). 
-         That leaves us with the following regular expression to validate credit card 
-         number formats:</P>
-      <PRE>(\d{4}[- ]){3}\d{4}</PRE>
-      <P>Here the parenthesis act to group (and mark for future reference) 
-         sub-expressions, and the {4} means "repeat exactly 4 times". This is an example 
-         of the extended regular expression syntax used by Perl, awk and egrep. Regex++ 
-         also supports the older "basic" syntax used by sed and grep, but this is 
-         generally less useful, unless you already have some basic regular expressions 
-         that you need to reuse.</P>
-      <P>Now let's take that expression and place it in some C++ code to validate the 
-         format of a credit card number:</P>
-      <PRE><B>bool</B> validate_card_format(<B>const</B> std::string& s)
-{
-   <B>static</B> <B>const</B> <A href="basic_regex.html">boost::regex</A> e("(\\d{4}[- ]){3}\\d{4}");
-   <B>return</B> <A href="regex_match.html">regex_match</A>(s, e);
-}</PRE>
-      <P>Note how we had to add some extra escapes to the expression: remember that the 
-         escape is seen once by the C++ compiler, before it gets to be seen by the 
-         regular expression engine, consequently escapes in regular expressions have to 
-         be doubled up when embedding them in C/C++ code. Also note that all the 
-         examples assume that your compiler supports Koenig lookup, if yours doesn't 
-         (for example VC6), then you will have to add some boost:: prefixes to some of 
-         the function calls in the examples.</P>
-      <P>Those of you who are familiar with credit card processing, will have realized 
-         that while the format used above is suitable for human readable card numbers, 
-         it does not represent the format required by online credit card systems; these 
-         require the number as a string of 16 (or possibly 15) digits, without any 
-         intervening spaces. What we need is a means to convert easily between the two 
-         formats, and this is where search and replace comes in. Those who are familiar 
-         with the utilities <I>sed</I> and <I>Perl</I> will already be ahead here; we 
-         need two strings - one a regular expression - the other a "<A href="format_syntax.html">format 
-            string</A>" that provides a description of the text to replace the match 
-         with. In regex++ this search and replace operation is performed with the 
-         algorithm<A href="regex_replace.html"> regex_replace</A>, for our credit card 
-         example we can write two algorithms like this to provide the format 
-         conversions:</P>
-      <PRE><I>// match any format with the regular expression:
-</I><B>const</B> boost::regex e("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
-<B>const</B> std::string machine_format("\\1\\2\\3\\4");
-<B>const</B> std::string human_format("\\1-\\2-\\3-\\4");
-
-std::string machine_readable_card_number(<B>const</B> std::string s)
-{
-   <B>return</B> <A href="regex_replace.html">regex_replace</A>(s, e, machine_format, boost::match_default | boost::format_sed);
-}
-
-std::string human_readable_card_number(<B>const</B> std::string s)
-{
-   <B>return</B> <A href="regex_replace.html">regex_replace</A>(s, e, human_format, boost::match_default | boost::format_sed);
-}</PRE>
-      <P>Here we've used marked sub-expressions in the regular expression to split out 
-         the four parts of the card number as separate fields, the format string then 
-         uses the sed-like syntax to replace the matched text with the reformatted 
-         version.</P>
-      <P>In the examples above, we haven't directly manipulated the results of a regular 
-         expression match, however in general the result of a match contains a number of 
-         sub-expression matches in addition to the overall match. When the library needs 
-         to report a regular expression match it does so using an instance of the class <A href="match_results.html">
-            match_results</A>, as before there are typedefs of this class for the most 
-         common cases:
-      </P>
-      <PRE><B>namespace </B>boost{
-<B>typedef</B> match_results&lt;<B>const</B> <B>char</B>*&gt; cmatch;
-<B>typedef</B> match_results&lt;<B>const</B> <B>wchar_t</B>*&gt; wcmatch;
-<STRONG>typedef</STRONG> match_results&lt;std::string::const_iterator&gt; smatch;
-<STRONG>typedef</STRONG> match_results&lt;std::wstring::const_iterator&gt; wsmatch; 
-}</PRE>
-      <P>The algorithms <A href="regex_search.html">regex_search</A> and&nbsp;<A href="regex_match.html">regex_match</A>
-         make use of match_results to report what matched; the difference between these 
-         algorithms is that <A href="regex_match.html">regex_match</A> will only find 
-         matches that consume <EM>all</EM> of the input text, where as <A href="regex_search.html">
-            regex_search</A> will <EM>search</EM> for a match anywhere within the text 
-         being matched.</P>
-      <P>Note that these algorithms are not restricted to searching regular C-strings, 
-         any bidirectional iterator type can be searched, allowing for the possibility 
-         of seamlessly searching almost any kind of data.
-      </P>
-      <P>For search and replace operations, in addition to the algorithm <A href="regex_replace.html">
-            regex_replace</A> that we have already seen, the <A href="match_results.html">match_results</A>
-         class has a format member that takes the result of a match and a format string, 
-         and produces a new string by merging the two.</P>
-      <P>For iterating through all occurences of an expression within a text, there are 
-         two iterator types: <A href="regex_iterator.html">regex_iterator</A> will 
-         enumerate over the <A href="match_results.html">match_results</A> objects 
-         found, while <A href="regex_token_iterator.html">regex_token_iterator</A> will 
-         enumerate a series of strings (similar to perl style split operations).</P>
-      <P>For those that dislike templates, there is a high level wrapper class RegEx 
-         that is an encapsulation of the lower level template code - it provides a 
-         simplified interface for those that don't need the full power of the library, 
-         and supports only narrow characters, and the "extended" regular expression 
-         syntax. This class is now deprecated as it does not form part of the regular 
-         expressions C++ standard library proposal.
-      </P>
-      <P>The <A href="posix_api.html">POSIX API</A> functions: regcomp, regexec, regfree 
-         and regerror, are available in both narrow character and Unicode versions, and 
-         are provided for those who need compatibility with these API's.
-      </P>
-      <P>Finally, note that the library now has run-time <A href="localisation.html">localization</A>
-         support, and recognizes the full POSIX regular expression syntax - including 
-         advanced features like multi-character collating elements and equivalence 
-         classes - as well as providing compatibility with other regular expression 
-         libraries including GNU and BSD4 regex packages, and to a more limited extent 
-         Perl 5.
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/introduction.qbk b/doc/introduction.qbk
new file mode 100644
index 00000000..b7a5184c
--- /dev/null
+++ b/doc/introduction.qbk
@@ -0,0 +1,163 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section Introduction and Overview]
+
+Regular expressions are a form of pattern-matching that are often used in 
+text processing; many users will be familiar with the Unix utilities grep, sed  
+and awk, and the programming language Perl, each of which make extensive use 
+of regular expressions. Traditionally C++ users have been limited to the 
+POSIX C API's for manipulating regular expressions, and while Boost.Regex does 
+provide these API's, they do not represent the best way to use the library. 
+For example Boost.Regex can cope with wide character strings, or search and 
+replace operations (in a manner analogous to either sed or Perl), something 
+that traditional C libraries can not do.
+
+The class [basic_regex] is the key class in this library; it represents a 
+"machine readable" regular expression, and is very closely modeled on 
+`std::basic_string`, think of it as a string plus the actual state-machine 
+required by the regular expression algorithms. Like `std::basic_string` there 
+are two typedefs that are almost always the means by which this class is referenced:
+
+   namespace boost{
+
+   template <class charT, 
+            class traits = regex_traits<charT> >
+   class basic_regex;
+
+   typedef basic_regex<char> regex;
+   typedef basic_regex<wchar_t> wregex;
+
+   }
+
+To see how this library can be used, imagine that we are writing a credit 
+card processing application. Credit card numbers generally come as a string 
+of 16-digits, separated into groups of 4-digits, and separated by either a 
+space or a hyphen. Before storing a credit card number in a database 
+(not necessarily something your customers will appreciate!), we may want to 
+verify that the number is in the correct format. To match any digit we could 
+use the regular expression [0-9], however ranges of characters like this are 
+actually locale dependent. Instead we should use the POSIX standard 
+form \[\[:digit:\]\], or the Boost.Regex and Perl shorthand for this \\d (note 
+that many older libraries tended to be hard-coded to the C-locale, 
+consequently this was not an issue for them). That leaves us with the 
+following regular expression to validate credit card number formats:
+
+[pre (\d{4}[- ]){3}\d{4}]
+
+Here the parenthesis act to group (and mark for future reference) 
+sub-expressions, and the {4} means "repeat exactly 4 times". This is an 
+example of the extended regular expression syntax used by Perl, awk and egrep. 
+Boost.Regex also supports the older "basic" syntax used by sed and grep, 
+but this is generally less useful, unless you already have some basic regular 
+expressions that you need to reuse.
+
+Now let's take that expression and place it in some C++ code to validate the 
+format of a credit card number:
+
+   bool validate_card_format(const std::string& s)
+   {
+      static const boost::regex e("(\\d{4}[- ]){3}\\d{4}");
+      return regex_match(s, e);
+   }
+
+Note how we had to add some extra escapes to the expression: remember that 
+the escape is seen once by the C++ compiler, before it gets to be seen by 
+the regular expression engine, consequently escapes in regular expressions 
+have to be doubled up when embedding them in C/C++ code. Also note that 
+all the examples assume that your compiler supports argument-dependent-lookup
+lookup, if yours doesn't (for example VC6), then you will have to add some 
+`boost::` prefixes to some of the function calls in the examples.
+
+Those of you who are familiar with credit card processing, will have realized 
+that while the format used above is suitable for human readable card numbers, 
+it does not represent the format required by online credit card systems; these 
+require the number as a string of 16 (or possibly 15) digits, without any 
+intervening spaces. What we need is a means to convert easily between the two 
+formats, and this is where search and replace comes in. Those who are familiar 
+with the utilities sed and Perl will already be ahead here; we need two 
+strings - one a regular expression - the other a "format string" that provides 
+a description of the text to replace the match with. In Boost.Regex this 
+search 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");
+   const std::string machine_format("\\1\\2\\3\\4");
+   const std::string human_format("\\1-\\2-\\3-\\4");
+
+   std::string machine_readable_card_number(const std::string s)
+   {
+      return regex_replace(s, e, machine_format, boost::match_default | boost::format_sed);
+   }
+
+   std::string human_readable_card_number(const std::string s)
+   {
+      return regex_replace(s, e, human_format, boost::match_default | boost::format_sed);
+   }
+
+Here we've used marked sub-expressions in the regular expression to split out 
+the four parts of the card number as separate fields, the format string then 
+uses the sed-like syntax to replace the matched text with the reformatted version.
+
+In the examples above, we haven't directly manipulated the results of 
+a regular expression match, however in general the result of a match contains 
+a number of sub-expression matches in addition to the overall match. When the 
+library needs to report a regular expression match it does so using an instance 
+of the class [match_results], as before there are typedefs of this class for 
+the most common cases:
+
+   namespace boost{
+
+   typedef match_results<const char*>                  cmatch;
+   typedef match_results<const wchar_t*>               wcmatch;
+   typedef match_results<std::string::const_iterator>  smatch;
+   typedef match_results<std::wstring::const_iterator> wsmatch; 
+
+   }
+
+The algorithms [regex_search] and [regex_match] make use of [match_results] 
+to report what matched; the difference between these algorithms is that 
+[regex_match] will only find matches that consume /all/ of the input text, 
+where as [regex_search] will search for a match anywhere within the text being matched.
+
+Note that these algorithms are not restricted to searching regular C-strings, 
+any bidirectional iterator type can be searched, allowing for the 
+possibility of seamlessly searching almost any kind of data.
+
+For search and replace operations, in addition to the algorithm [regex_replace] 
+that we have already seen, the [match_results] class has a `format` member that 
+takes the result of a match and a format string, and produces a new string 
+by merging the two.
+
+For iterating through all occurences of an expression within a text, 
+there are two iterator types: [regex_iterator] will enumerate over the 
+[match_results] objects found, while [regex_token_iterator] will enumerate 
+a series of strings (similar to perl style split operations).
+
+For those that dislike templates, there is a high level wrapper class 
+[RegEx] that is an encapsulation of the lower level template code - it 
+provides a simplified interface for those that don't need the full 
+power of the library, and supports only narrow characters, and the 
+"extended" regular expression syntax. This class is now deprecated as 
+it does not form part of the regular expressions C++ standard library proposal.
+
+The POSIX API functions: [regcomp], [regexec], [regfree] and [regerr], 
+are available in both narrow character and Unicode versions, and are 
+provided for those who need compatibility with these API's.
+
+Finally, note that the library now has 
+[link boost_regex.background_information.locale run-time localization support], 
+and recognizes the full POSIX regular expression syntax - including 
+advanced features like multi-character collating elements and equivalence 
+classes - as well as providing compatibility with other regular expression 
+libraries including GNU and BSD4 regex packages, PCRE and Perl 5. 
+
+[endsect]
+
+
diff --git a/doc/leftmost_longest.qbk b/doc/leftmost_longest.qbk
new file mode 100644
index 00000000..c50cde23
--- /dev/null
+++ b/doc/leftmost_longest.qbk
@@ -0,0 +1,32 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:leftmost_longest_rule The Leftmost Longest Rule]
+
+Often there is more than one way of matching a regular expression at a 
+particular location, for POSIX basic and extended regular expressions, 
+the "best" match is determined as follows:
+
+# Find the leftmost match, if there is only one match possible at 
+this location then return it.
+# Find the longest of the possible matches, along with any ties.  
+If there is only one such possible match then return it.
+# If there are no marked sub-expressions, then all the remaining 
+alternatives are indistinguishable; return the first of these found.
+# 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.
+# 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.
+# Repeat steps 4 and 5 for each additional marked sub-expression.
+# If there is still more than one possible match remaining, then they are 
+indistinguishable; return the first one found.
+
+[endsect]
+
+
diff --git a/doc/locale.qbk b/doc/locale.qbk
new file mode 100644
index 00000000..1e3c15c5
--- /dev/null
+++ b/doc/locale.qbk
@@ -0,0 +1,231 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:locale Localization]
+
+Boost.Regex provides extensive support for run-time localization, the 
+localization model used can be split into two parts: front-end and back-end.
+
+Front-end localization deals with everything which the user sees - 
+error messages, and the regular expression syntax itself. For example a 
+French application could change \[\[:word:\]\] to \[\[:mot:\]\] and \\w to \\m. 
+Modifying the front end locale requires active support from the developer, 
+by providing the library with a message catalogue to load, containing the 
+localized strings. Front-end locale is affected by the LC_MESSAGES category only.
+
+Back-end localization deals with everything that occurs after the expression 
+has been parsed - in other words everything that the user does not see or 
+interact with directly. It deals with case conversion, collation, and character 
+class membership. The back-end locale does not require any intervention from 
+the developer - the library will acquire all the information it requires for 
+the current locale from the underlying operating system / run time library. 
+This means that if the program user does not interact with regular 
+expressions directly - for example if the expressions are embedded in your 
+C++ code - then no explicit localization is required, as the library will 
+take care of everything for you. For example embedding the expression 
+\[\[:word:\]\]+ in your code will always match a whole word, if the 
+program is run on a machine with, for example, a Greek locale, then it 
+will still match a whole word, but in Greek characters rather than Latin ones. 
+The back-end locale is affected by the LC_TYPE and LC_COLLATE categories.
+
+There are three separate localization mechanisms supported by Boost.Regex:
+
+[h4 Win32 localization model.]
+
+This is the default model when the library is compiled under Win32, and is 
+encapsulated by the traits class `w32_regex_traits`. When this model is in 
+effect each [basic_regex] object gets it's own LCID, by default this is 
+the users default setting as returned by GetUserDefaultLCID, but you can 
+call imbue on the `basic_regex` object to set it's locale to some other 
+LCID if you wish. All the settings used by Boost.Regex are acquired directly 
+from the operating system bypassing the C run time library. Front-end 
+localization requires a resource dll, containing a string table with the 
+user-defined strings. The traits class exports the function:
+
+   static std::string set_message_catalogue(const std::string& s);
+
+which needs to be called with a string identifying the name of the resource 
+dll, before your code compiles any regular expressions (but not necessarily 
+before you construct any `basic_regex` instances):
+
+   boost::w32_regex_traits<char>::set_message_catalogue("mydll.dll");
+
+The library provides full Unicode support under NT, under Windows 9x 
+the library degrades gracefully - characters 0 to 255 are supported, the 
+remainder are treated as "unknown" graphic characters.
+
+[h4 C localization model.]
+
+This model has been deprecated in favor of the C++ locale for all non-Windows 
+compilers that support it.  This locale is encapsulated by the traits class 
+`c_regex_traits`, Win32 users can force this model to take effect by 
+defining the pre-processor symbol BOOST_REGEX_USE_C_LOCALE. When this model is 
+in effect there is a single global locale, as set by `setlocale`. All settings 
+are acquired from your run time library, consequently Unicode support is 
+dependent upon your run time library implementation.
+
+Front end localization is not supported.
+
+Note that calling setlocale invalidates all compiled regular expressions, 
+calling `setlocale(LC_ALL, "C")` will make this library behave equivalent to 
+most traditional regular expression libraries including version 1 of this library.
+
+[h4 C++ localization model.]
+
+This model is the default for non-Windows compilers.
+
+When this model is in effect each instance of [basic_regex] has its own 
+instance of `std::locale`, class [basic_regex] also has a member function 
+`imbue` which allows the locale for the expression to be set on a 
+per-instance basis. Front end localization requires a POSIX message catalogue, 
+which will be loaded via the `std::messages` facet of the expression's locale, 
+the traits class exports the symbol:
+
+   static std::string set_message_catalogue(const std::string& s);
+
+which needs to be called with a string identifying the name of the 
+message catalogue, before your code compiles any regular expressions 
+(but not necessarily before you construct any basic_regex instances):
+
+   boost::cpp_regex_traits<char>::set_message_catalogue("mycatalogue");
+
+Note that calling `basic_regex<>::imbue` will invalidate any expression 
+currently compiled in that instance of [basic_regex].
+
+Finally note that if you build the library with a non-default localization model, 
+then the appropriate pre-processor symbol (BOOST_REGEX_USE_C_LOCALE or 
+BOOST_REGEX_USE_CPP_LOCALE) must be defined both when you build the support 
+library, and when you include `<boost/regex.hpp>` or `<boost/cregex.hpp>` 
+in your code. The best way to ensure this is to add the #define to 
+`<boost/regex/user.hpp>`.
+
+[h4 Providing a message catalogue]
+
+In order to localize the front end of the library, you need to provide the 
+library with the appropriate message strings contained either in a resource 
+dll's string table (Win32 model), or a POSIX message catalogue (C++ models). 
+In the latter case the messages must appear in message set zero of the 
+catalogue. The messages and their id's are as follows:
+ 
+[table
+  	[[Message][id][Meaning][Default value]] 	 
+  	[[101][The character used to start a sub-expression.]["(" 	 ]]
+  	[[102][The character used to end a sub-expression declaration.][")" 	 ]]
+  	[[103][The character used to denote an end of line assertion.]["$" 	 ]]
+  	[[104][The character used to denote the start of line assertion.]["^" 	 ]]
+  	[[105][The character used to denote the "match any character expression".]["." 	 ]]
+  	[[106][The match zero or more times repetition operator.]["*" 	 ]]
+  	[[107][The match one or more repetition operator.]["+" 	 ]]
+  	[[108][The match zero or one repetition operator.]["?" 	 ]]
+  	[[109][The character set opening character.]["\[" 	 ]]
+  	[[110][The character set closing character.]["\]" 	 ]]
+  	[[111][The alternation operator.]["|" 	 ]]
+  	[[112][The escape character.]["\\" 	 ]]
+  	[[113][The hash character (not currently used).]["#" 	 ]]
+  	[[114][The range operator.]["-" 	 ]]
+  	[[115][The repetition operator opening character.]["{" 	 ]]
+  	[[116][The repetition operator closing character.]["}" 	 ]]
+  	[[117][The digit characters.]["0123456789" 	 ]]
+  	[[118][The character which when preceded by an escape character represents the word boundary assertion.]["b" 	 ]]
+  	[[119][The character which when preceded by an escape character represents the non-word boundary assertion.]["B" 	 ]]
+  	[[120][The character which when preceded by an escape character represents the word-start boundary assertion.]["<" 	 ]]
+  	[[121][The character which when preceded by an escape character represents the word-end boundary assertion.][">" 	 ]]
+  	[[122][The character which when preceded by an escape character represents any word character.]["w" 	 ]]
+  	[[123][The character which when preceded by an escape character represents a non-word character.]["W" 	 ]]
+  	[[124][The character which when preceded by an escape character represents a start of buffer assertion.]["`A" 	 ]]
+  	[[125][The character which when preceded by an escape character represents an end of buffer assertion.]["'z" 	 ]]
+  	[[126][The newline character. ]["\\n" 	 ]]
+  	[[127][The comma separator.]["," 	 ]]
+  	[[128][The character which when preceded by an escape character represents the bell character.]["a" 	 ]]
+  	[[129][The character which when preceded by an escape character represents the form feed character.]["f" 	 ]]
+  	[[130][The character which when preceded by an escape character represents the newline character.]["n" 	 ]]
+  	[[131][The character which when preceded by an escape character represents the carriage return character.]["r" 	 ]]
+  	[[132][The character which when preceded by an escape character represents the tab character.]["t" 	 ]]
+  	[[133][The character which when preceded by an escape character represents the vertical tab character.]["v" 	 ]]
+  	[[134][The character which when preceded by an escape character represents the start of a hexadecimal character constant.]["x" 	 ]]
+  	[[135][The character which when preceded by an escape character represents the start of an ASCII escape character.]["c" 	 ]]
+  	[[136][The colon character.][":" 	 ]]
+  	[[137][The equals character.]["=" 	 ]]
+  	[[138][The character which when preceded by an escape character represents the ASCII escape character.]["e" 	 ]]
+  	[[139][The character which when preceded by an escape character represents any lower case character.]["l" 	 ]]
+  	[[140][The character which when preceded by an escape character represents any non-lower case character.]["L" 	 ]]
+  	[[141][The character which when preceded by an escape character represents any upper case character.]["u" 	 ]]
+  	[[142][The character which when preceded by an escape character represents any non-upper case character.]["U" 	 ]]
+  	[[143][The character which when preceded by an escape character represents any space character.]["s" 	 ]]
+  	[[144][The character which when preceded by an escape character represents any non-space character.]["S" 	 ]]
+  	[[145][The character which when preceded by an escape character represents any digit character.]["d" 	 ]]
+  	[[146][The character which when preceded by an escape character represents any non-digit character.]["D" 	 ]]
+  	[[147][The character which when preceded by an escape character represents the end quote operator.]["E" 	 ]]
+  	[[148][The character which when preceded by an escape character represents the start quote operator.]["Q" 	 ]]
+  	[[149][The character which when preceded by an escape character represents a Unicode combining character sequence.]["X" 	 ]]
+  	[[150][The character which when preceded by an escape character represents any single character.]["C" 	 ]]
+  	[[151][The character which when preceded by an escape character represents end of buffer operator.]["Z" 	 ]]
+  	[[152][The character which when preceded by an escape character represents the continuation assertion.]["G" 	 ]]
+  	[[153][The character which when preceeded by (? indicates a zero width negated forward lookahead assert.][! 	 ]]
+]
+
+Custom error messages are loaded as follows: 
+
+[table
+  	[[Message ID][Error message ID][Default string 	 ]]
+  	[[201][REG_NOMATCH]["No match" 	 ]]
+  	[[202][REG_BADPAT]["Invalid regular expression" 	 ]]
+  	[[203][REG_ECOLLATE]["Invalid collation character" 	 ]]
+  	[[204][REG_ECTYPE]["Invalid character class name" 	 ]]
+  	[[205][REG_EESCAPE]["Trailing backslash" 	 ]]
+  	[[206][REG_ESUBREG]["Invalid back reference" 	 ]]
+  	[[207][REG_EBRACK]["Unmatched [ or [^" 	 ]]
+  	[[208][REG_EPAREN]["Unmatched ( or \\(" 	 ]]
+  	[[209][REG_EBRACE]["Unmatched \\{" 	 ]]
+  	[[210][REG_BADBR]["Invalid content of \\{\\}" 	 ]]
+  	[[211][REG_ERANGE]["Invalid range end" 	 ]]
+  	[[212][REG_ESPACE]["Memory exhausted" 	 ]]
+  	[[213][REG_BADRPT]["Invalid preceding regular expression" 	 ]]
+  	[[214][REG_EEND]["Premature end of regular expression" 	 ]]
+  	[[215][REG_ESIZE]["Regular expression too big" 	 ]]
+  	[[216][REG_ERPAREN]["Unmatched ) or \\)" 	 ]]
+  	[[217][REG_EMPTY]["Empty expression" 	 ]]
+  	[[218][REG_E_UNKNOWN]["Unknown error" 	 ]]
+]
+
+Custom character class names are loaded as followed: 
+
+[table
+  	[[Message ID][Description][Equivalent default class name 	 ]]
+  	[[300][The character class name for alphanumeric characters.]["alnum" 	 ]]
+  	[[301][The character class name for alphabetic characters.]["alpha" 	 ]]
+  	[[302][The character class name for control characters.]["cntrl" 	 ]]
+  	[[303][The character class name for digit characters.]["digit" 	 ]]
+  	[[304][The character class name for graphics characters.]["graph" 	 ]]
+  	[[305][The character class name for lower case characters.]["lower" 	 ]]
+  	[[306][The character class name for printable characters.]["print" 	 ]]
+  	[[307][The character class name for punctuation characters.]["punct" 	 ]]
+  	[[308][The character class name for space characters.]["space" 	 ]]
+  	[[309][The character class name for upper case characters.]["upper" 	 ]]
+  	[[310][The character class name for hexadecimal characters.]["xdigit" 	 ]]
+  	[[311][The character class name for blank characters.]["blank" 	 ]]
+  	[[312][The character class name for word characters.]["word" 	 ]]
+  	[[313][The character class name for Unicode characters.]["unicode" 	 ]]
+]
+
+Finally, custom collating element names are loaded starting from message 
+id 400, and terminating when the first load thereafter fails. Each message 
+looks something like: "tagname string" where tagname is the name used 
+inside [[.tagname.]] and string is the actual text of the collating element. 
+Note that the value of collating element [[.zero.]] is used for the 
+conversion of strings to numbers - if you replace this with another value then 
+that will be used for string parsing - for example use the Unicode 
+character 0x0660 for [[.zero.]] if you want to use Unicode Arabic-Indic 
+digits in your regular expressions in place of Latin digits.
+
+Note that the POSIX defined names for character classes and collating elements 
+are always available - even if custom names are defined, in contrast, 
+custom error messages, and custom syntax messages replace the default ones.
+
+[endsect]
+
+
diff --git a/doc/localisation.html b/doc/localisation.html
deleted file mode 100644
index 31bd8663..00000000
--- a/doc/localisation.html
+++ /dev/null
@@ -1,808 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Localisation</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Localisation</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>Boost.regex&nbsp;provides extensive support for run-time localization, the 
-         localization model used can be split into two parts: front-end and back-end.</p>
-      <p>Front-end localization deals with everything which the user sees - error 
-         messages, and the regular expression syntax itself. For example a French 
-         application could change [[:word:]] to [[:mot:]] and \w to \m. Modifying the 
-         front end locale requires active support from the developer, by providing the 
-         library with a message catalogue to load, containing the localized strings. 
-         Front-end locale is affected by the LC_MESSAGES category only.</p>
-      <p>Back-end localization deals with everything that occurs after the expression 
-         has been parsed - in other words everything that the user does not see or 
-         interact with directly. It deals with case conversion, collation, and character 
-         class membership. The back-end locale does not require any intervention from 
-         the developer - the library will acquire all the information it requires for 
-         the current locale from the underlying operating system / run time library. 
-         This means that if the program user does not interact with regular expressions 
-         directly - for example if the expressions are embedded in your C++ code - then 
-         no explicit localization is required, as the library will take care of 
-         everything for you. For example embedding the expression [[:word:]]+ in your 
-         code will always match a whole word, if the program is run on a machine with, 
-         for example, a Greek locale, then it will still match a whole word, but in 
-         Greek characters rather than Latin ones. The back-end locale is affected by the 
-         LC_TYPE and LC_COLLATE categories.</p>
-      <p>There are three separate localization mechanisms supported by boost.regex:</p>
-      <h3>Win32 localization model.</h3>
-      <p>This is the default model when the library is compiled under Win32, and is 
-         encapsulated by the traits class w32_regex_traits. When this model is in effect 
-         each basic_regex object gets it's own LCID, by default this is the users 
-         default setting as returned by GetUserDefaultLCID, but you can call <EM>imbue</EM>
-         on the basic_regex object to set it's locale to some other LCID if you wish. 
-         All the settings used by boost.regex are acquired directly from the operating 
-         system bypassing the C run time library. Front-end localization requires a 
-         resource dll, containing a string table with the user-defined strings. The 
-         traits class exports the function:</p>
-      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
-      <p>which needs to be called with a string identifying the name of the resource 
-         dll, <i>before</i> your code compiles any regular expressions (but not 
-         necessarily before you construct any <i>basic_regex</i> instances):</p>
-      <p>
-         boost::w32_regex_traits&lt;char&gt;::set_message_catalogue("mydll.dll");</p>
-      <p>
-         The library provides full Unicode support under NT, under Windows 9x the 
-         library degrades gracefully - characters 0 to 255 are supported, the remainder 
-         are treated as "unknown" graphic characters.</p>
-      <h3>C localization model.</h3>
-      <p>This model has been deprecated in favor of the C++ localoe for all non-Windows 
-         compilers that support&nbsp;it.&nbsp; This locale is encapsulated by the traits 
-         class <i>c_regex_traits</i>, Win32 users can force this model to take effect by 
-         defining the pre-processor symbol BOOST_REGEX_USE_C_LOCALE. When this model is 
-         in effect there is a single global locale, as set by <i>setlocale</i>. All 
-         settings are acquired from your run time library, consequently Unicode support 
-         is dependent upon your run time library implementation.</p>
-      <P>Front end localization is not supported.</P>
-      <P>Note that calling <i>setlocale</i> invalidates all compiled regular 
-         expressions, calling <tt>setlocale(LC_ALL, "C")</tt> will make this library 
-         behave equivalent to most traditional regular expression libraries including 
-         version 1 of this library.</P>
-      <h3>C++ localization model.</h3>
-      <p>This model is the default for non-Windows compilers.</p>
-      <P>
-         When this model is in effect each instance of basic_regex&lt;&gt; has its own 
-         instance of std::locale, class basic_regex&lt;&gt; also has a member function <i>imbue</i>
-         which allows the locale for the expression to be set on a per-instance basis. 
-         Front end localization requires a POSIX message catalogue, which will be loaded 
-         via the std::messages facet of the expression's locale, the traits class 
-         exports the symbol:</P>
-      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
-      <p>which needs to be called with a string identifying the name of the message 
-         catalogue, <i>before</i> your code compiles any regular expressions (but not 
-         necessarily before you construct any <i>basic_regex</i> instances):</p>
-      <p>
-         boost::cpp_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-      <p>Note that calling basic_regex&lt;&gt;::imbue will invalidate any expression 
-         currently compiled in that instance of basic_regex&lt;&gt;.</p>
-      <P>Finally note that if you build the library with a non-default localization 
-         model, then the appropriate pre-processor symbol (BOOST_REGEX_USE_C_LOCALE or 
-         BOOST_REGEX_USE_CPP_LOCALE) must be defined both when you build the support 
-         library, and when you include &lt;boost/regex.hpp&gt; or 
-         &lt;boost/cregex.hpp&gt; in your code. The best way to ensure this is to add 
-         the #define to &lt;boost/regex/user.hpp&gt;.</P>
-      <h3>Providing a message catalogue:</h3>
-      <p>
-         In order to localize the front end of the library, you need to provide the 
-         library with the appropriate message strings contained either in a resource 
-         dll's string table (Win32 model), or a POSIX message catalogue (C++ models). In 
-         the latter case the messages must appear in message set zero of the catalogue. 
-         The messages and their id's are as follows:<br>
-         &nbsp;</p>
-      <p></p>
-      <table id="Table2" cellspacing="0" cellpadding="6" width="624" border="0">
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">Message id</td>
-            <td valign="top" width="32%">Meaning</td>
-            <td valign="top" width="29%">Default value</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">101</td>
-            <td valign="top" width="32%">The character used to start a sub-expression.</td>
-            <td valign="top" width="29%">"("</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">102</td>
-            <td valign="top" width="32%">The character used to end a sub-expression 
-               declaration.</td>
-            <td valign="top" width="29%">")"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">103</td>
-            <td valign="top" width="32%">The character used to denote an end of line 
-               assertion.</td>
-            <td valign="top" width="29%">"$"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">104</td>
-            <td valign="top" width="32%">The character used to denote the start of line 
-               assertion.</td>
-            <td valign="top" width="29%">"^"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">105</td>
-            <td valign="top" width="32%">The character used to denote the "match any character 
-               expression".</td>
-            <td valign="top" width="29%">"."</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">106</td>
-            <td valign="top" width="32%">The match zero or more times repetition operator.</td>
-            <td valign="top" width="29%">"*"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">107</td>
-            <td valign="top" width="32%">The match one or more repetition operator.</td>
-            <td valign="top" width="29%">"+"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">108</td>
-            <td valign="top" width="32%">The match zero or one repetition operator.</td>
-            <td valign="top" width="29%">"?"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">109</td>
-            <td valign="top" width="32%">The character set opening character.</td>
-            <td valign="top" width="29%">"["</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">110</td>
-            <td valign="top" width="32%">The character set closing character.</td>
-            <td valign="top" width="29%">"]"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">111</td>
-            <td valign="top" width="32%">The alternation operator.</td>
-            <td valign="top" width="29%">"|"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">112</td>
-            <td valign="top" width="32%">The escape character.</td>
-            <td valign="top" width="29%">"\\"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">113</td>
-            <td valign="top" width="32%">The hash character (not currently used).</td>
-            <td valign="top" width="29%">"#"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">114</td>
-            <td valign="top" width="32%">The range operator.</td>
-            <td valign="top" width="29%">"-"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">115</td>
-            <td valign="top" width="32%">The repetition operator opening character.</td>
-            <td valign="top" width="29%">"{"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">116</td>
-            <td valign="top" width="32%">The repetition operator closing character.</td>
-            <td valign="top" width="29%">"}"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">117</td>
-            <td valign="top" width="32%">The digit characters.</td>
-            <td valign="top" width="29%">"0123456789"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">118</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the word boundary assertion.</td>
-            <td valign="top" width="29%">"b"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">119</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the non-word boundary assertion.</td>
-            <td valign="top" width="29%">"B"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">120</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the word-start boundary assertion.</td>
-            <td valign="top" width="29%">"&lt;"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">121</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the word-end boundary assertion.</td>
-            <td valign="top" width="29%">"&gt;"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">122</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any word character.</td>
-            <td valign="top" width="29%">"w"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">123</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents a non-word character.</td>
-            <td valign="top" width="29%">"W"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">124</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents a start of buffer assertion.</td>
-            <td valign="top" width="29%">"`A"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">125</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents an end of buffer assertion.</td>
-            <td valign="top" width="29%">"'z"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">126</td>
-            <td valign="top" width="32%">The newline character.</td>
-            <td valign="top" width="29%">"\n"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">127</td>
-            <td valign="top" width="32%">The comma separator.</td>
-            <td valign="top" width="29%">","</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">128</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the bell character.</td>
-            <td valign="top" width="29%">"a"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">129</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the form feed character.</td>
-            <td valign="top" width="29%">"f"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">130</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the newline character.</td>
-            <td valign="top" width="29%">"n"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">131</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the carriage return character.</td>
-            <td valign="top" width="29%">"r"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">132</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the tab character.</td>
-            <td valign="top" width="29%">"t"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">133</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the vertical tab character.</td>
-            <td valign="top" width="29%">"v"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">134</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the start of a hexadecimal character constant.</td>
-            <td valign="top" width="29%">"x"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">135</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the start of an ASCII escape character.</td>
-            <td valign="top" width="29%">"c"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">136</td>
-            <td valign="top" width="32%">The colon character.</td>
-            <td valign="top" width="29%">":"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">137</td>
-            <td valign="top" width="32%">The equals character.</td>
-            <td valign="top" width="29%">"="</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">138</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the ASCII escape character.</td>
-            <td valign="top" width="29%">"e"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">139</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any lower case character.</td>
-            <td valign="top" width="29%">"l"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">140</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-lower case character.</td>
-            <td valign="top" width="29%">"L"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">141</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any upper case character.</td>
-            <td valign="top" width="29%">"u"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">142</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-upper case character.</td>
-            <td valign="top" width="29%">"U"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">143</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any space character.</td>
-            <td valign="top" width="29%">"s"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">144</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-space character.</td>
-            <td valign="top" width="29%">"S"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">145</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any digit character.</td>
-            <td valign="top" width="29%">"d"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">146</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any non-digit character.</td>
-            <td valign="top" width="29%">"D"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">147</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the end quote operator.</td>
-            <td valign="top" width="29%">"E"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">148</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the start quote operator.</td>
-            <td valign="top" width="29%">"Q"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">149</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents a Unicode combining character sequence.</td>
-            <td valign="top" width="29%">"X"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">150</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents any single character.</td>
-            <td valign="top" width="29%">"C"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">151</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents end of buffer operator.</td>
-            <td valign="top" width="29%">"Z"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="21%">152</td>
-            <td valign="top" width="32%">The character which when preceded by an escape 
-               character represents the continuation assertion.</td>
-            <td valign="top" width="29%">"G"</td>
-            <td valign="top" width="9%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td>153</td>
-            <td>The character which when preceeded by (? indicates a zero width negated 
-               forward lookahead assert.</td>
-            <td>!</td>
-            <td>&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>Custom error messages are loaded as follows:&nbsp;</p>
-      <p></p>
-      <table id="Table3" cellspacing="0" cellpadding="7" width="624" border="0">
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">Message ID</td>
-            <td valign="top" width="32%">Error message ID</td>
-            <td valign="top" width="31%">Default string</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">201</td>
-            <td valign="top" width="32%">REG_NOMATCH</td>
-            <td valign="top" width="31%">"No match"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">202</td>
-            <td valign="top" width="32%">REG_BADPAT</td>
-            <td valign="top" width="31%">"Invalid regular expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">203</td>
-            <td valign="top" width="32%">REG_ECOLLATE</td>
-            <td valign="top" width="31%">"Invalid collation character"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">204</td>
-            <td valign="top" width="32%">REG_ECTYPE</td>
-            <td valign="top" width="31%">"Invalid character class name"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">205</td>
-            <td valign="top" width="32%">REG_EESCAPE</td>
-            <td valign="top" width="31%">"Trailing backslash"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">206</td>
-            <td valign="top" width="32%">REG_ESUBREG</td>
-            <td valign="top" width="31%">"Invalid back reference"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">207</td>
-            <td valign="top" width="32%">REG_EBRACK</td>
-            <td valign="top" width="31%">"Unmatched [ or [^"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">208</td>
-            <td valign="top" width="32%">REG_EPAREN</td>
-            <td valign="top" width="31%">"Unmatched ( or \\("</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">209</td>
-            <td valign="top" width="32%">REG_EBRACE</td>
-            <td valign="top" width="31%">"Unmatched \\{"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">210</td>
-            <td valign="top" width="32%">REG_BADBR</td>
-            <td valign="top" width="31%">"Invalid content of \\{\\}"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">211</td>
-            <td valign="top" width="32%">REG_ERANGE</td>
-            <td valign="top" width="31%">"Invalid range end"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">212</td>
-            <td valign="top" width="32%">REG_ESPACE</td>
-            <td valign="top" width="31%">"Memory exhausted"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">213</td>
-            <td valign="top" width="32%">REG_BADRPT</td>
-            <td valign="top" width="31%">"Invalid preceding regular expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">214</td>
-            <td valign="top" width="32%">REG_EEND</td>
-            <td valign="top" width="31%">"Premature end of regular expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">215</td>
-            <td valign="top" width="32%">REG_ESIZE</td>
-            <td valign="top" width="31%">"Regular expression too big"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">216</td>
-            <td valign="top" width="32%">REG_ERPAREN</td>
-            <td valign="top" width="31%">"Unmatched ) or \\)"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">217</td>
-            <td valign="top" width="32%">REG_EMPTY</td>
-            <td valign="top" width="31%">"Empty expression"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">218</td>
-            <td valign="top" width="32%">REG_E_UNKNOWN</td>
-            <td valign="top" width="31%">"Unknown error"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>Custom character class names are loaded as followed:&nbsp;</p>
-      <p></p>
-      <table id="Table4" cellspacing="0" cellpadding="7" width="624" border="0">
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">Message ID</td>
-            <td valign="top" width="32%">Description</td>
-            <td valign="top" width="31%">Equivalent default class name</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">300</td>
-            <td valign="top" width="32%">The character class name for alphanumeric characters.</td>
-            <td valign="top" width="31%">"alnum"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">301</td>
-            <td valign="top" width="32%">The character class name for alphabetic characters.</td>
-            <td valign="top" width="31%">"alpha"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">302</td>
-            <td valign="top" width="32%">The character class name for control characters.</td>
-            <td valign="top" width="31%">"cntrl"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">303</td>
-            <td valign="top" width="32%">The character class name for digit characters.</td>
-            <td valign="top" width="31%">"digit"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">304</td>
-            <td valign="top" width="32%">The character class name for graphics characters.</td>
-            <td valign="top" width="31%">"graph"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">305</td>
-            <td valign="top" width="32%">The character class name for lower case characters.</td>
-            <td valign="top" width="31%">"lower"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">306</td>
-            <td valign="top" width="32%">The character class name for printable characters.</td>
-            <td valign="top" width="31%">"print"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">307</td>
-            <td valign="top" width="32%">The character class name for punctuation characters.</td>
-            <td valign="top" width="31%">"punct"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">308</td>
-            <td valign="top" width="32%">The character class name for space characters.</td>
-            <td valign="top" width="31%">"space"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">309</td>
-            <td valign="top" width="32%">The character class name for upper case characters.</td>
-            <td valign="top" width="31%">"upper"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">310</td>
-            <td valign="top" width="32%">The character class name for hexadecimal characters.</td>
-            <td valign="top" width="31%">"xdigit"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">311</td>
-            <td valign="top" width="32%">The character class name for blank characters.</td>
-            <td valign="top" width="31%">"blank"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">312</td>
-            <td valign="top" width="32%">The character class name for word characters.</td>
-            <td valign="top" width="31%">"word"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="8%">&nbsp;</td>
-            <td valign="top" width="22%">313</td>
-            <td valign="top" width="32%">The character class name for Unicode characters.</td>
-            <td valign="top" width="31%">"unicode"</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>Finally, custom collating element names are loaded starting from message id 
-         400, and terminating when the first load thereafter fails. Each message looks 
-         something like: "tagname string" where <i>tagname</i> is the name used inside 
-         [[.tagname.]] and <i>string</i> is the actual text of the collating element. 
-         Note that the value of collating element [[.zero.]] is used for the conversion 
-         of strings to numbers - if you replace this with another value then that will 
-         be used for string parsing - for example use the Unicode character 0x0660 for 
-         [[.zero.]] if you want to use Unicode Arabic-Indic digits in your regular 
-         expressions in place of Latin digits.</p>
-      <p>Note that the POSIX defined names for character classes and collating elements 
-         are always available - even if custom names are defined, in contrast, custom 
-         error messages, and custom syntax messages replace the default ones.</p>
-      <p></p>
-      <hr>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/match_flag_type.html b/doc/match_flag_type.html
deleted file mode 100644
index 64f61402..00000000
--- a/doc/match_flag_type.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: match_flag_type</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">match_flag_type</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Synopsis</h3>
-      <p>The type <code>match_flag_type</code> is an implementation specific bitmask 
-         type (17.3.2.1.2) that controls how a regular expression is matched against a 
-         character sequence.&nbsp; The behavior of the format flags is described in more 
-         detail in the <A href="format_syntax.html">format syntax guide</A>.</p>
-      <pre>
-namespace boost{ namespace regex_constants{
-
-typedef <EM>implemenation-specific-bitmask-type</EM> match_flag_type;
-
-static const match_flag_type match_default = 0;
-static const match_flag_type match_not_bob;
-static const match_flag_type match_not_eob;
-static const match_flag_type match_not_bol;
-static const match_flag_type match_not_eol;
-static const match_flag_type match_not_bow;
-static const match_flag_type match_not_eow;
-static const match_flag_type match_any;
-static const match_flag_type match_not_null;
-static const match_flag_type match_continuous;
-static const match_flag_type match_partial;
-static const match_flag_type match_single_line;
-static const match_flag_type match_prev_avail;
-static const match_flag_type match_not_dot_newline;
-static const match_flag_type match_not_dot_null;
-
-static const match_flag_type format_default = 0;
-static const match_flag_type format_sed;
-static const match_flag_type format_perl;
-static const match_flag_type format_literal; <BR>
-static const match_flag_type format_no_copy;
-static const match_flag_type format_first_only;
-static const match_flag_type format_all;
-
-} // namespace regex_constants
-} // namespace boost
-</pre>
-      <h3>Description</h3>
-      <p>The type <code>match_flag_type</code> is an implementation specific bitmask 
-         type (17.3.2.1.2). When matching a regular expression against a sequence of 
-         characters [first, last) then setting its elements has the effects listed in 
-         the table below:</p>
-      <p></p>
-      <table id="Table2" cellspacing="1" cellpadding="7" width="100%" border="0">
-         <tr>
-            <td valign="top" width="50%">
-               <p><STRONG>Element</STRONG></p>
-            </td>
-            <td valign="top" width="50%">
-               <p><STRONG>Effect if set</STRONG></p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_default</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that matching of regular expressions proceeds without any 
-                  modification of the normal rules used in ECMA-262, ECMAScript Language 
-                  Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects (FWD.1)</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_bob</td>
-            <td valign="top" width="50%">Specifies that the expressions "\A" and 
-               "\`"&nbsp;should not match against the sub-sequence [first,first).</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_eob</td>
-            <td valign="top" width="50%">Specifies that the expressions "\'", "\z" and 
-               "\Z"&nbsp;should not match against the sub-sequence [last,last).</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_bol</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression "^" should not be matched against the 
-                  sub-sequence [first,first).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_eol</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression "$" should not be matched against the 
-                  sub-sequence [last,last).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_bow</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expressions "\&lt;" and&nbsp;"\b" should not be matched 
-                  against the sub-sequence [first,first).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_eow</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expressions "\&gt;" and&nbsp;"\b" should not be matched 
-                  against the sub-sequence [last,last).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_any</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that if more than one match is possible then any match is an 
-                  acceptable result: this will still find the leftmost match, but may not find 
-                  the "best" match at that position.&nbsp; Use this flag if you care about the 
-                  speed of matching, but don't care what was matched (only whether there is one 
-                  or not).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_not_null</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression can not be matched against an empty sequence.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_continuous</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that the expression must match a sub-sequence that begins at <i>first</i>.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_partial</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that if no match can be found, then it is acceptable to return a 
-                  match [from, last) such that from!= last, if there could exist some longer 
-                  sequence of characters [from,to) of which [from,last) is a prefix, and which 
-                  would result in a full match.</p>
-               <P>This flag is used when matching incomplete or very long texts, see the <A href="partial_matches.html">
-                     partial matches documentation</A> for more information.</P>
-            </td>
-         </tr>
-         <TR>
-            <TD vAlign="top" width="50%">match_extra</TD>
-            <TD vAlign="top" width="50%">Instructs the matching engine to retain all available <A href="captures.html">
-                  capture</A> information; if a capturing group is repeated then information 
-               about every repeat is available via <A href="match_results.html#m17">match_results::captures()</A>
-               or <A href="sub_match.html#m8">sub_match_captures().</A></TD>
-         </TR>
-         <TR>
-            <TD vAlign="top" width="50%">match_single_line</TD>
-            <TD vAlign="top" width="50%">Equivalent to the inverse of Perl's m/ modifier; 
-               prevents ^ from matching after an embedded newline character (so that it only 
-               matches at the start of the text being matched), and $ from matching before an 
-               embedded newline (so that it only matches at the end of the text being 
-               matched).</TD>
-         </TR>
-         <tr>
-            <td valign="top" width="50%">
-               <p>match_prev_avail</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that <code>--first</code> is a valid iterator position, when this 
-                  flag is set then the flags <code>match_not_bol</code> and <code>match_not_bow</code>
-                  are ignored by the regular expression algorithms (RE.7) and iterators (RE.8).</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_dot_newline</td>
-            <td valign="top" width="50%">Specifies that the expression "." does not match a 
-               newline character.&nbsp; This is the inverse of Perl's s/ modifier.</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">match_not_dot_null</td>
-            <td valign="top" width="50%">Specified that the expression "." does not match a 
-               character null '\0'.</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_default</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that when a regular expression match is to be replaced by a new 
-                  string, that the new string is constructed using the rules used by the 
-                  ECMAScript replace function in ECMA-262, ECMAScript Language Specification, 
-                  Chapter 15 part 5.4.11 String.prototype.replace. (FWD.1). In addition during 
-                  search and replace operations then all non-overlapping occurrences of the 
-                  regular expression are located and replaced, and sections of the input that did 
-                  not match the expression, are copied unchanged to the output string.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_sed</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>Specifies that when a regular expression match is to be replaced by a new 
-                  string, that the new string is constructed using the rules used by the Unix sed 
-                  utility in IEEE Std 1003.1-2001, Portable Operating SystemInterface (POSIX ), 
-                  Shells and Utilities..</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_perl</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>
-                  Specifies that when a regular expression match is to be replaced by a new 
-                  string, that the new string is constructed using the same rules as Perl 5.</p>
-            </td>
-         </tr>
-         <TR>
-            <TD vAlign="top" width="50%">format_literal</TD>
-            <TD vAlign="top" width="50%">Specified that when a regular expression match is to 
-               be replaced by a new string, that the new string is a literal copy of the 
-               replacement text.</TD>
-         </TR>
-         <tr>
-            <td valign="top" width="50%" height="32">format_all</td>
-            <td valign="top" width="50%" height="32">Specifies that all syntax extensions are 
-               enabled, including conditional (?ddexpression1:expression2) replacements: see 
-               the <A href="format_syntax.html">format string guide</A> for more details.</td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_no_copy</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>When specified during a search and replace operation, then sections of the 
-                  character container sequence being searched that do match the regular 
-                  expression, are not copied to the output string.</p>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" width="50%">
-               <p>format_first_only</p>
-            </td>
-            <td valign="top" width="50%">
-               <p>When specified during a search and replace operation, then only the first 
-                  occurrence of the regular expression is replaced.</p>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p></p>
-      <hr>
-      <br>
-      <br>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/match_flag_type.qbk b/doc/match_flag_type.qbk
new file mode 100644
index 00000000..4bccf1af
--- /dev/null
+++ b/doc/match_flag_type.qbk
@@ -0,0 +1,123 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:match_flag_type match_flag_type]
+
+The type `match_flag_type` is an implementation specific bitmask type 
+(see C++ std 17.3.2.1.2) that controls how a regular expression is 
+matched against a character sequence.  The behavior of the format 
+flags is described in more detail in the 
+[link boost_regex.format format syntax guide].
+
+   namespace boost{ namespace regex_constants{
+
+   typedef implemenation-specific-bitmask-type match_flag_type;
+
+   static const match_flag_type match_default = 0;
+   static const match_flag_type match_not_bob;
+   static const match_flag_type match_not_eob;
+   static const match_flag_type match_not_bol;
+   static const match_flag_type match_not_eol;
+   static const match_flag_type match_not_bow;
+   static const match_flag_type match_not_eow;
+   static const match_flag_type match_any;
+   static const match_flag_type match_not_null;
+   static const match_flag_type match_continuous;
+   static const match_flag_type match_partial;
+   static const match_flag_type match_single_line;
+   static const match_flag_type match_prev_avail;
+   static const match_flag_type match_not_dot_newline;
+   static const match_flag_type match_not_dot_null;
+   static const match_flag_type match_posix;
+   static const match_flag_type match_perl;
+   static const match_flag_type match_nosubs;
+   static const match_flag_type match_extra;
+
+   static const match_flag_type format_default = 0;
+   static const match_flag_type format_sed;
+   static const match_flag_type format_perl;
+   static const match_flag_type format_literal; 
+
+   static const match_flag_type format_no_copy;
+   static const match_flag_type format_first_only;
+   static const match_flag_type format_all;
+
+   } // namespace regex_constants
+   } // namespace boost
+
+[h4 Description]
+
+The type `match_flag_type` is an implementation specific bitmask type 
+(see C++ std 17.3.2.1.2). When matching a regular expression against a 
+sequence of characters \[first, last) then setting its elements has the 
+effects listed in the table below:
+
+[table
+[[Element][Effect if set]]
+[[match_default][Specifies that matching of regular expressions proceeds without any modification of the normal rules used in ECMA-262, ECMAScript Language Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects (FWD.1)]]
+[[match_not_bob][Specifies that the expressions "\\A" and "\\`" should not match against the sub-sequence \[first,first).]]
+[[match_not_eob][Specifies that the expressions "\\'", "\\z" and "\\Z" should not match against the sub-sequence \[last,last).]]
+[[match_not_bol][Specifies that the expression "^" should not be matched against the sub-sequence \[first,first).]]
+[[match_not_eol][Specifies that the expression "$" should not be matched against the sub-sequence \[last,last).]]
+[[match_not_bow][Specifies that the expressions "\\<" and "\\b" should not be matched against the sub-sequence \[first,first).]]
+[[match_not_eow][Specifies that the expressions "\\>" and "\\b" should not be matched against the sub-sequence \[last,last).]]
+[[match_any][Specifies that if more than one match is possible then any match is an acceptable result: this will still find the leftmost match, but may not find the "best" match at that position.  Use this flag if you care about the speed of matching, but don't care what was matched (only whether there is one or not).]]
+[[match_not_null][Specifies that the expression can not be matched against an empty sequence.]]
+[[match_continuous][Specifies that the expression must match a sub-sequence that begins at first.]]
+[[match_partial][Specifies that if no match can be found, then it is acceptable to return a match \[from, last) such that from!= last, if there could exist some longer sequence of characters \[from,to) of which \[from,last) is a prefix, and which would result in a full match.
+This flag is used when matching incomplete or very long texts, see the partial matches documentation for more information.]]
+[[match_extra][Instructs the matching engine to retain all available capture information; if a capturing group is repeated then information about every repeat is available via match_results::captures() or sub_match_captures().]]
+[[match_single_line][Equivalent to the inverse of Perl's m/ modifier; prevents ^ from matching after an embedded newline character (so that it only matches at the start of the text being matched), and $ from matching before an embedded newline (so that it only matches at the end of the text being matched).]]
+[[match_prev_avail][Specifies that --first is a valid iterator position, when this flag is set then the flags match_not_bol and match_not_bow are ignored by the regular expression algorithms (RE.7) and iterators (RE.8).]]
+[[match_not_dot_newline][Specifies that the expression "." does not match a newline character.  This is the inverse of Perl's s/ modifier.]]
+[[match_not_dot_null][Specified that the expression "." does not match a character null '\\0'.]]
+[[match_posix][Specifies that the expression should be matched according to the POSIX
+   [link boost_regex.syntax.leftmost_longest_rule leftmost-longest rule], 
+   regardless of what kind of expression was compiled.
+   Be warned that these rules do not work well with many Perl-specific features
+   such as non-greedy repeats.]]
+[[match_perl][Specifies that the expression should be matched according to
+   the [link boost_regex.syntax.perl_syntax.what_gets_matched Perl matching rules], 
+   irrespective of what kind of expression was
+   compiled.]]
+[[match_nosubs][Makes the expression behave as if it had no marked
+   subexpressions, no matter how many capturing groups are actually
+   present.  The [match_results] class will only contain information
+   about the overall match, and not any sub-expressions.]]
+
+[[format_default][Specifies that when a regular expression match is to be 
+      replaced by a new string, that the new string is constructed using the rules 
+      used by the ECMAScript replace function in ECMA-262, ECMAScript Language 
+      Specification, Chapter 15 part 5.4.11 String.prototype.replace. (FWD.1). 
+      
+      This is functionally identical to the [link boost_regex.format.perl_format Perl format string rules].
+      
+      In addition during search and replace operations then all non-overlapping 
+      occurrences of the regular expression are located and replaced, and sections 
+      of the input that did not match the expression, are copied unchanged to the 
+      output string.]]
+[[format_sed][Specifies that when a regular expression match is to be 
+      replaced by a new string, that the new string is constructed using 
+      the rules used by the Unix sed utility in IEEE Std 1003.1-2001, 
+      Portable Operating SystemInterface (POSIX ), Shells and Utilities.      
+      See also the [link boost_regex.format.sed_format Sed Format string reference].]]
+[[format_perl][Specifies that when a regular expression match is to be replaced by 
+      a new string, that the new string is constructed using 
+      [link boost_regex.format.perl_format the same rules as Perl 5].]]
+[[format_literal][Specified that when a regular expression match is to be 
+      replaced by a new string, that the new string is a literal copy of 
+      the replacement text.]]
+[[format_all][Specifies that all syntax extensions are enabled, including 
+      conditional (?ddexpression1:expression2) replacements: see 
+      the [link boost_regex.format.boost_format_syntax format string guide] for more details.]]
+[[format_no_copy][When specified during a search and replace operation, then sections of the character container sequence being searched that do match the regular expression, are not copied to the output string.]]
+[[format_first_only][When specified during a search and replace operation, then only the first occurrence of the regular expression is replaced.]]
+]
+
+[endsect]
+
+
diff --git a/doc/match_result.qbk b/doc/match_result.qbk
new file mode 100644
index 00000000..eb3861fd
--- /dev/null
+++ b/doc/match_result.qbk
@@ -0,0 +1,379 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:match_results match_results]
+
+[h4 Synopsis]
+
+   #include <boost/regex.hpp>
+
+Regular expressions are different from many simple pattern-matching algorithms 
+in that as well as finding an overall match they can also produce 
+sub-expression matches: each sub-expression being delimited in the 
+pattern by a pair of parenthesis (...). There has to be some method for 
+reporting sub-expression matches back to the user: this is achieved this by 
+defining a class `match_results` that acts as an indexed collection of 
+sub-expression matches, each sub-expression match being contained in an 
+object of type [sub_match].
+
+Template class `match_results` denotes a collection of character 
+sequences representing the result of a regular expression match. Objects of 
+type `match_results` are passed to the algorithms [regex_match] and [regex_search], 
+and are returned by the iterator [regex_iterator].  Storage for the 
+collection is allocated and freed as necessary by the member functions of 
+class `match_results`.
+
+The template class `match_results` conforms to the requirements of a Sequence, 
+as specified in (lib.sequence.reqmts), except that only operations defined for 
+const-qualified Sequences are supported.
+
+Class template `match_results` is most commonly used as one of the typedefs 
+`cmatch`, `wcmatch`, `smatch`, or `wsmatch`:
+
+   template <class BidirectionalIterator,
+            class Allocator = std::allocator<sub_match<BidirectionalIterator> >
+   class match_results;
+
+   typedef match_results<const char*>              cmatch;
+   typedef match_results<const wchar_t*>           wcmatch;
+   typedef match_results<string::const_iterator>   smatch;
+   typedef match_results<wstring::const_iterator>  wsmatch;
+
+   template <class BidirectionalIterator,
+            class Allocator = std::allocator<sub_match<BidirectionalIterator> >
+   class match_results
+   { 
+   public: 
+      typedef          sub_match<BidirectionalIterator>                        value_type;
+      typedef          const value_type&                                       const_reference;
+      typedef          const_reference                                         reference;
+      typedef          implementation defined                                  const_iterator;
+      typedef          const_iterator                                          iterator;
+      typedef typename iterator_traits<BidirectionalIterator>::difference_type difference_type;
+      typedef typename Allocator::size_type                                    size_type;
+      typedef          Allocator                                               allocator_type;
+      typedef typename iterator_traits<BidirectionalIterator>::value_type      char_type;
+      typedef          basic_string<char_type>                                 string_type;
+
+      // construct/copy/destroy:
+      ``[link boost_regex.match_results.construct explicit match_results]``(const Allocator& a = Allocator());
+      ``[link boost_regex.match_results.copy_construct match_results]``(const match_results& m);
+      ``[link boost_regex.match_results.assign match_results& operator=]``(const match_results& m); 
+      ~match_results();
+
+      // size:
+      size_type ``[link boost_regex.match_results.size size]``() const;
+      size_type ``[link boost_regex.match_results.max_size max_size]``() const;
+      bool ``[link boost_regex.match_results.empty empty]``() const;
+      // element access:
+      difference_type ``[link boost_regex.match_results.length length]``(int sub = 0) const;
+      difference_type ``[link boost_regex.match_results.position position]``(unsigned int sub = 0) const;
+      string_type ``[link boost_regex.match_results.str str]``(int sub = 0) const;
+      const_reference ``[link boost_regex.match_results.subscript operator\[\]]``(int n) const;
+
+      const_reference ``[link boost_regex.match_results.prefix prefix]``() const;
+
+      const_reference ``[link boost_regex.match_results.suffix suffix]``() const;
+      const_iterator ``[link boost_regex.match_results.begin begin]``() const;
+      const_iterator ``[link boost_regex.match_results.end end]``() const;
+      // format:
+      template <class OutputIterator>
+      OutputIterator ``[link boost_regex.match_results.format format]``(OutputIterator out,
+                           const string_type& fmt,
+                           match_flag_type flags = format_default) const;
+      string_type ``[link boost_regex.match_results.format2 format]``(const string_type& fmt,
+                        match_flag_type flags = format_default) const;
+
+      allocator_type ``[link boost_regex.match_results.get_allocator get_allocator]``() const;
+      void ``[link boost_regex.match_results.swap swap]``(match_results& that);
+
+   #ifdef BOOST_REGEX_MATCH_EXTRA
+      typedef typename value_type::capture_sequence_type capture_sequence_type;
+      const capture_sequence_type& ``[link boost_regex.match_results.captures captures]``(std::size_t i)const;
+   #endif
+
+   };
+
+   template <class BidirectionalIterator, class Allocator>
+   bool ``[link boost_regex.match_results.op_eq operator ==]`` (const match_results<BidirectionalIterator, Allocator>& m1,
+                     const match_results<BidirectionalIterator, Allocator>& m2);
+   template <class BidirectionalIterator, class Allocator>
+   bool ``[link boost_regex.match_results.op_ne operator !=]`` (const match_results<BidirectionalIterator, Allocator>& m1,
+                     const match_results<BidirectionalIterator, Allocator>& m2);
+
+   template <class charT, class traits, class BidirectionalIterator, class Allocator>
+   basic_ostream<charT, traits>&
+      ``[link boost_regex.match_results.op_stream operator <<]`` (basic_ostream<charT, traits>& os,
+                  const match_results<BidirectionalIterator, Allocator>& m);
+
+   template <class BidirectionalIterator, class Allocator>
+   void ``[link boost_regex.match_results.op_swap swap]``(match_results<BidirectionalIterator, Allocator>& m1,
+            match_results<BidirectionalIterator, Allocator>& m2);
+
+[h4 Description]
+
+In all `match_results` constructors, a copy of the Allocator argument is used 
+for any memory allocation performed by the constructor or member functions 
+during the lifetime of the object.
+
+[#boost_regex.match_results.construct]
+
+   match_results(const Allocator& a = Allocator());
+
+[*Effects]: Constructs an object of class `match_results`. The postconditions of 
+this function are indicated in the table:
+
+[table 
+[[Element][Value]]
+[[empty()][true]]
+[[size()][0]]
+[[str()][basic_string<charT>()]]
+]
+ 
+
+
+[#boost_regex.match_results.copy_construct]
+
+   match_results(const match_results& m);
+
+[*Effects]: Constructs an object of class match_results, as a copy of m.
+
+
+[#boost_regex.match_results.assign]
+
+   match_results& operator=(const match_results& m);
+
+[*Effects]: Assigns m to *this. The postconditions of this function are 
+indicated in the table:
+
+[table
+[[Element][Value]]
+[[empty()][m.empty().]]
+[[size()][m.size().]]
+[[str(n)][m.str(n) for all integers n < m.size().]]
+[[prefix()][m.prefix().]]
+[[suffix()][m.suffix().]]
+[[(*this)\[n\]][m\[n\] for all integers n < m.size().]]
+[[length(n)][m.length(n) for all integers n < m.size().]]
+[[position(n)][m.position(n) for all integers n < m.size().]]
+]
+
+[#boost_regex.match_results.size]
+
+   size_type size()const;
+
+[*Effects]: Returns the number of [sub_match] elements stored in *this; that is 
+the number of marked sub-expressions in the regular expression that was 
+matched plus one.
+
+
+[#boost_regex.match_results.max_size]
+
+   size_type max_size()const;
+
+[*Effects]: Returns the maximum number of [sub_match] elements that can be 
+stored in *this.
+
+
+[#boost_regex.match_results.empty]
+
+   bool empty()const;
+
+[*Effects]: Returns size() == 0.
+
+
+
+[#boost_regex.match_results.length]
+
+   difference_type length(int sub = 0)const;
+
+[*Effects]: Returns the length of sub-expression /sub/, that is to say: 
+`(*this)[sub].length()`.
+
+
+[#boost_regex.match_results.position]
+
+   difference_type position(unsigned int sub = 0)const;
+
+[*Effects]: Returns the starting location of sub-expression /sub/, or -1 if /sub/ was 
+not matched.  Note that if this represents a partial match , then `position()` 
+will return the location of the partial match even though `(*this)[0].matched` is false.
+
+
+[#boost_regex.match_results.str]
+
+   string_type str(int sub = 0)const;
+
+[*Effects]: Returns sub-expression /sub/ as a string:  `string_type((*this)[sub])`.
+
+
+[#boost_regex.match_results.subscript]
+
+   const_reference operator[](int n) const;
+
+[*Effects]: Returns a reference to the [sub_match] object representing the character 
+sequence that matched marked sub-expression /n/. If `n == 0` then returns a 
+reference to a [sub_match] object representing the character sequence that 
+matched the whole regular expression.  If /n/ is out of range, or if /n/ is an 
+unmatched sub-expression, then returns a [sub_match] object whose matched 
+member is false.
+
+
+[#boost_regex.match_results.prefix]
+
+   const_reference prefix()const;
+
+[*Effects]: Returns a reference to the [sub_match] object representing the 
+character sequence from the start of the string being matched or searched, to the 
+start of the match found.
+
+
+[#boost_regex.match_results.suffix]
+
+   const_reference suffix()const;
+
+[*Effects]: Returns a reference to the [sub_match] object representing the 
+character sequence from the end of the match found to the end of the 
+string being matched or searched.
+
+
+[#boost_regex.match_results.begin]
+
+   const_iterator begin()const;
+
+[*Effects]: Returns a starting iterator that enumerates over all the marked 
+sub-expression matches stored in *this.
+
+
+[#boost_regex.match_results.end]
+
+   const_iterator end()const;
+
+[*Effects]: Returns a terminating iterator that enumerates over all the 
+marked sub-expression matches stored in *this.
+
+[#boost_regex.match_results_format]
+[#boost_regex.match_results.format]
+
+   template <class OutputIterator>
+   OutputIterator format(OutputIterator out,
+                        const string_type& fmt,
+                        match_flag_type flags = format_default);
+
+[*Requires]: The type `OutputIterator` conforms to the Output Iterator requirements 
+(C++ std 24.1.2).
+
+[*Effects]: Copies the character sequence `[fmt.begin(), fmt.end())` to 
+`OutputIterator` /out/. For each format specifier or escape sequence in 
+/fmt/, replace that sequence with either the character(s) it represents, 
+or the sequence of characters within `*this` to which it refers. 
+The bitmasks specified in flags determines what format specifiers or 
+escape sequences are recognized, by default this is the format used by 
+ECMA-262, ECMAScript Language Specification, Chapter 15 part 
+5.4.11 String.prototype.replace.
+
+See the [link boost_regex.format format syntax guide for more information].
+
+[*Returns]: out.
+
+
+[#boost_regex.match_results.format2]
+
+   string_type format(const string_type& fmt,
+                     match_flag_type flags = format_default);
+
+[*Effects]: Returns a copy of the string /fmt/. For each format specifier or 
+escape sequence in /fmt/, replace that sequence with either the 
+character(s) it represents, or the sequence of characters within `*this` to 
+which it refers. The bitmasks specified in flags determines what format 
+specifiers or escape sequences are recognized, by default this is the format 
+used by ECMA-262, ECMAScript Language Specification, Chapter 15 part 
+5.4.11 String.prototype.replace.
+
+See the [link boost_regex.format format syntax guide for more information].
+
+[#boost_regex.match_results.get_allocator]
+
+   allocator_type get_allocator()const;
+
+[*Effects]: Returns a copy of the Allocator that was passed to the object's constructor.
+
+[#boost_regex.match_results.swap]
+
+   void swap(match_results& that);
+
+[*Effects]: Swaps the contents of the two sequences.
+
+[*Postcondition]: *this contains the sequence of matched sub-expressions that were in that, that contains the sequence of matched sub-expressions that were in *this.
+
+[*Complexity]: constant time.
+
+[#boost_regex.match_results.capture_type]
+
+   typedef typename value_type::capture_sequence_type capture_sequence_type;
+
+Defines an implementation-specific type that satisfies the requirements of 
+a standard library Sequence (21.1.1 including the optional Table 68 operations), 
+whose value_type is a `sub_match<BidirectionalIterator>`. This type happens to be 
+`std::vector<sub_match<BidirectionalIterator> >`, but you shouldn't actually 
+rely on that.
+
+[#boost_regex.match_results.captures]
+
+   const capture_sequence_type& captures(std::size_t i)const; 
+
+[*Effects]: returns a sequence containing all the captures obtained for sub-expression i.
+
+[*Returns]: `(*this)[i].captures();`
+
+[*Preconditions]: the library must be built and used with BOOST_REGEX_MATCH_EXTRA defined, 
+and you must pass the flag match_extra to the regex matching functions 
+([regex_match], [regex_search], [regex_iterator] or [regex_token_iterator]) in 
+order for this member function to be defined and return useful information.
+
+[*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.
+
+[#boost_regex.match_results.op_eq]
+
+   template <class BidirectionalIterator, class Allocator>
+   bool operator == (const match_results<BidirectionalIterator, Allocator>& m1,
+                     const match_results<BidirectionalIterator, Allocator>& m2);
+
+[*Effects]: Compares the two sequences for equality.
+
+[#boost_regex.match_results.op_ne]
+
+   template <class BidirectionalIterator, class Allocator>
+   bool operator != (const match_results<BidirectionalIterator, Allocator>& m1,
+                     const match_results<BidirectionalIterator, Allocator>& m2);
+
+[*Effects]: Compares the two sequences for inequality.
+
+[#boost_regex.match_results.op_stream]
+
+   template <class charT, class traits, class BidirectionalIterator, class Allocator>
+   basic_ostream<charT, traits>&
+      operator << (basic_ostream<charT, traits>& os,
+                  const match_results<BidirectionalIterator, Allocator>& m);
+
+[*Effects]: Writes the contents of /m/ to the stream /os/ as if by calling 
+`os << m.str()`; Returns /os/.
+
+[#boost_regex.match_results.op_swap]
+
+   template <class BidirectionalIterator, class Allocator>
+   void swap(match_results<BidirectionalIterator, Allocator>& m1,
+            match_results<BidirectionalIterator, Allocator>& m2);
+
+[*Effects]: Swaps the contents of the two sequences.
+
+[endsect]
+
diff --git a/doc/match_results.html b/doc/match_results.html
deleted file mode 100644
index 6634b90a..00000000
--- a/doc/match_results.html
+++ /dev/null
@@ -1,459 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: class match_results</title>
-      <meta content="HTML Tidy, see www.w3.org" name="generator">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <p></p>
-      <table id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-         <tr>
-            <td vAlign="top" width="300">
-               <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class match_results</h2>
-            </td>
-            <td width="50">
-               <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Contents</h3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#description">Description</A> </dt>
-      </dl>
-      <h3><a name="synopsis"></a>Synopsis</h3>
-      <p>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt;</p>
-      <p>Regular expressions are different from many simple pattern-matching algorithms 
-         in that as well as finding an overall match they can also produce 
-         sub-expression matches: each sub-expression being delimited in the pattern by a 
-         pair of parenthesis (...). There has to be some method for reporting 
-         sub-expression matches back to the user: this is achieved this by defining a 
-         class <i>match_results</i> that acts as an indexed collection of sub-expression 
-         matches, each sub-expression match being contained in an object of type <i><A href="sub_match.html">
-               sub_match</A></i> .</p>
-      <p>Template class match_results denotes a collection of character sequences 
-         representing the result of a regular expression match. Objects of type 
-         match_results are passed to the algorithms <A href="regex_match.html">regex_match</A>
-         and <A href="regex_search.html">regex_search</A>, and are returned by the 
-         iterator <A href="regex_iterator.html">regex_iterator</A> .&nbsp; Storage for 
-         the collection is allocated and freed as necessary by the member functions of 
-         class match_results.</p>
-      <p>The template class match_results conforms to the requirements of a Sequence, as 
-         specified in (lib.sequence.reqmts), except that only operations defined for 
-         const-qualified Sequences are supported.</p>
-      <p>Class template match_results is most commonly used as one of the typedefs 
-         cmatch, wcmatch, smatch, or wsmatch:</p>
-      <pre>template &lt;class BidirectionalIterator,
-          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
-class match_results;
-
-typedef match_results&lt;const char*&gt; cmatch;
-typedef match_results&lt;const wchar_t*&gt; wcmatch;
-typedef match_results&lt;string::const_iterator&gt; smatch;
-typedef match_results&lt;wstring::const_iterator&gt; wsmatch;
-
-template &lt;class BidirectionalIterator,
-          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
-class match_results
-{ 
-public: 
-   typedef          sub_match&lt;BidirectionalIterator&gt;                        value_type;
-   typedef          const value_type&amp;                                       const_reference;
-   typedef          const_reference                                         reference;
-   typedef          implementation defined                                  const_iterator;
-   typedef          const_iterator                                          iterator;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
-   typedef typename Allocator::size_type                                    size_type;
-   typedef          Allocator                                               allocator_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::value_type      char_type;
-   typedef          basic_string&lt;char_type&gt;                                 string_type;
-
-   // construct/copy/destroy:
-   explicit <A href="#c1" >match_results</A>(const Allocator&amp; a = Allocator());
-   <A href="#c2" >match_results</A>(const match_results&amp; m);
-   <A href="#c3" >match_results</A>&amp; <A href="#c3" >operator</A>=(const match_results&amp; m); 
-   ~match_results();
-
-   // size:
-   size_type <A href="#m1" >size</A>() const;
-   size_type <A href="#m2" >max_size</A>() const;
-   bool <A href="#m3" >empty</A>() const;
-   // element access:
-   difference_type <A href="#m4" >length</A>(int sub = 0) const;
-   difference_type <A href="#m5" >position</A>(unsigned int sub = 0) const;
-   string_type <A href="#m6" >str</A>(int sub = 0) const;
-   const_reference <A href="#m7" >operator</A>[](int n) const;
-
-   const_reference <A href="#m8" >prefix</A>() const;
-
-   const_reference <A href="#m9" >suffix</A>() const;
-   const_iterator <A href="#m10" >begin</A>() const;
-   const_iterator <A href="#m11" >end</A>() const;
-   // format:
-   template &lt;class OutputIterator&gt;
-   OutputIterator <A href="#m12" >format</A>(OutputIterator out,
-                         const string_type&amp; fmt,
-                         match_flag_type flags = format_default) const;
-   string_type <A href="#m13" >format</A>(const string_type&amp; fmt,
-                      match_flag_type flags = format_default) const;
-
-   allocator_type <A href="#m14" >get_allocator</A>() const;
-   void <A href="#m15" >swap</A>(match_results&amp; that);
-
-#ifdef BOOST_REGEX_MATCH_EXTRA
-   typedef typename value_type::capture_sequence_type <A href="#m16" >capture_sequence_type</A>;
-   const capture_sequence_type&amp; <A href="#m17" >captures</A>(std::size_t i)const;
-#endif
-
-};
-
-template &lt;class BidirectionalIterator, class Allocator&gt;
-bool <A href="#n1" >operator</A> == (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);
-template &lt;class BidirectionalIterator, class Allocator&gt;
-bool <A href="#n2" >operator</A> != (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);
-
-template &lt;class charT, class traits, class BidirectionalIterator, class Allocator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   <A href="#n3" >operator</A> &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os,
-                const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m);
-
-template &lt;class BidirectionalIterator, class Allocator&gt;
-void <A href="#n4" >swap</A>(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-          match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);
-</pre>
-      <h3><a name="description"></a>Description</h3>
-      <h4>match_results constructors</h4>
-      <p>In all <code>match_results</code> constructors, a copy of the Allocator 
-         argument is used for any memory allocation performed by the constructor or 
-         member functions during the lifetime of the object.</p>
-      <pre><A name=c1></A>
-match_results(const Allocator&amp; a = Allocator());
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Constructs an object of class match_results. The postconditions 
-         of this function are indicated in the table:</p>
-      <p align="center"></p>
-      <center>
-         <table id="Table2" cellSpacing="1" cellPadding="7" width="624" border="1">
-            <tbody>
-               <tr>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Element</b></p>
-                  </td>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Value</b></p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>empty()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>true</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>size()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>0</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>str()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>basic_string&lt;charT&gt;()</p>
-                  </td>
-               </tr>
-            </tbody></table>
-      </center>
-      <p>&nbsp;</p>
-      <pre><A name=c2></A>
-match_results(const match_results&amp; m);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Constructs an object of class match_results, as a copy of m.</p>
-      <pre><A name=c3></A>
-match_results&amp; operator=(const match_results&amp; m);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Assigns m to *this. The postconditions of this function are 
-         indicated in the table:</p>
-      <p align="center"></p>
-      <center>
-         <table id="Table3" cellSpacing="1" cellPadding="7" width="624" border="1">
-            <tbody>
-               <tr>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Element</b></p>
-                  </td>
-                  <td vAlign="top" width="50%"><b></b>
-                     <p><b>Value</b></p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>empty()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.empty().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>size()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>str(n)</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.str(n) for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>prefix()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.prefix().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>suffix()</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.suffix().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>(*this)[n]</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m[n] for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>length(n)</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.length(n) for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-               <tr>
-                  <td vAlign="top" width="50%">
-                     <p>position(n)</p>
-                  </td>
-                  <td vAlign="top" width="50%">
-                     <p>m.position(n) for all integers n &lt; m.size().</p>
-                  </td>
-               </tr>
-            </tbody></table>
-      </center>
-      <h4>match_results size</h4>
-      <pre><A name=m1></A>
-size_type size()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the number of sub_match elements stored in *this; that 
-         is the number of marked sub-expressions in the regular expression that was 
-         matched plus one.</p>
-      <pre><A name=m2></A>
-size_type max_size()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the maximum number of sub_match elements that can be 
-         stored in *this.</p>
-      <pre><A name=m3></A>
-bool empty()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns <code>size() == 0</code>.</p>
-      <h4>match_results element access</h4>
-      <pre><A name=m4></A>
-difference_type length(int sub = 0)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the length of sub-expression <EM>sub</EM>, that is to 
-         say: <code>(*this)[sub].length()</code>.</p>
-      <pre><A name=m5></A>
-difference_type position(unsigned int sub = 0)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns the starting location of sub-expression <EM>sub</EM>, 
-         or -1 if <EM>sub</EM> was not matched.&nbsp; Note that if this represents a <A href="partial_matches.html">
-            partial match</A> , then <code>position()</code> will return the location of 
-         the partial match even though <code>(*this)[0].matched</code> is <EM>false</EM>.</p>
-      <pre><A name=m6></A>
-string_type str(int sub = 0)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns sub-expression <EM>sub</EM> as a string:&nbsp; <code>string_type((*this)[sub]).</code></p>
-      <pre><A name=m7></A>
-const_reference operator[](int n) const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a reference to the <code>sub_match</code> object 
-         representing the character sequence that matched marked sub-expression <i>n</i>. 
-         If <code>n == 0</code> then returns a reference to a <code>sub_match</code> object 
-         representing the character sequence that matched the whole regular 
-         expression.&nbsp; If <EM>n</EM> is out of range, or if <EM>n</EM> is an 
-         unmatched sub-expression, then returns a sub_match object whose <EM>matched</EM>
-         member is <EM>false</EM>.</p>
-      <pre><A name=m8></A>
-const_reference prefix()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a reference to the <code>sub_match</code> object 
-         representing the character sequence from the start of the string being 
-         matched/searched, to the start of the match found.</p>
-      <pre><A name=m9></A>
-const_reference suffix()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a reference to the <code>sub_match</code> object 
-         representing the character sequence from the end of the match found to the end 
-         of the string being matched/searched.</p>
-      <pre><A name=m10></A>
-const_iterator begin()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a starting iterator that enumerates over all the marked 
-         sub-expression matches stored in *this.</p>
-      <pre><A name=m11></A>
-const_iterator end()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a terminating iterator that enumerates over all the 
-         marked sub-expression matches stored in *this.</p>
-      <h4><A name="format"></A>match_results reformatting</h4>
-      <pre><A name=m12></A>template &lt;class OutputIterator&gt;
-OutputIterator format(OutputIterator out,
-                      const string_type&amp; fmt,
-                      <A href="match_flag_type.html" >match_flag_type</A> flags = format_default);
-</pre>
-      <b></b>
-      <p><b>Requires:</b> The type OutputIterator conforms to the Output Iterator 
-         requirements (24.1.2).</p>
-      <b></b>
-      <p><b>Effects:</b> Copies the character sequence <i>[fmt.begin(), fmt.end())</i> to 
-         OutputIterator <i>out</i>. For each format specifier or escape sequence in <i>fmt</i>, 
-         replace that sequence with either the character(s) it represents, or the 
-         sequence of characters within *this to which it refers. The bitmasks specified 
-         in <i><A href="match_flag_type.html">flags</A></i> determines what <A href="format_syntax.html">
-            format specifiers or escape sequences are recognized</A>, by default this is 
-         the format used by ECMA-262, ECMAScript Language Specification, Chapter 15 part 
-         5.4.11 String.prototype.replace.</p>
-      <b></b>
-      <p><b>Returns:</b> <i>out</i>.</p>
-      <pre><A name=m13></A>
-string_type format(const string_type&amp; fmt,
-                   <A href="match_flag_type.html" >match_flag_type</A> flags = format_default);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a copy of the string <i>fmt</i>. For each format 
-         specifier or escape sequence in <i>fmt</i>, replace that sequence with either 
-         the character(s) it represents, or the sequence of characters within *this to 
-         which it refers. The bitmasks specified in <i><A href="match_flag_type.html">flags</A></i>
-         determines what <A href="format_syntax.html">format specifiers or escape sequences 
-            are recognized</A>, by default this is the format used by ECMA-262, 
-         ECMAScript Language Specification, Chapter 15 part 5.4.11 
-         String.prototype.replace.</p>
-      <H4>Allocator access</H4>
-      <pre><A name=m14>allocator_type get_allocator()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> Returns a copy of the Allocator that was passed to the object's 
-         constructor.</p>
-      <H4><A name="m15"></A>Swap</H4>
-      <PRE>void swap(match_results&amp; that);
-</PRE>
-      <b></b>
-      <p><b>Effects:</b> Swaps the contents of the two sequences.</p>
-      <b></b>
-      <p><b>Postcondition:</b> <code>*this</code> contains the sequence of matched 
-         sub-expressions that were in <code>that</code>, <code>that</code> contains the 
-         sequence of matched sub-expressions that were in <code>*this</code>.</p>
-      <b></b>
-      <p><b>Complexity:</b> constant time.</p>
-      <H4>Captures</H4>
-      <PRE><A name=m16></A>typedef typename value_type::capture_sequence_type capture_sequence_type;</PRE>
-      <P>Defines an implementation-specific type that&nbsp;satisfies the requirements of 
-         a standard library Sequence (21.1.1 including the optional Table 68 
-         operations),&nbsp;whose value_type is a <EM>sub_match&lt;BidirectionalIterator&gt;</EM>.&nbsp;This 
-         type happens to be <EM>std::vector&lt;sub_match&lt;BidirectionalIterator&gt; &gt;</EM>, 
-         but you shouldn't actually rely on that.</P>
-      <PRE><A name=m17></A>const capture_sequence_type&amp; <A href="#m8" >captures</A>(std::size_t i)const; </PRE>
-      <P><STRONG>Effects:</STRONG> returns a sequence containing all the captures 
-         obtained for sub-expression <EM>i</EM>.</P>
-      <P><STRONG>Returns:</STRONG> <code>(*this)[i].captures();</code></P>
-      <P><STRONG>Preconditions:</STRONG> the library must be built and used with 
-         BOOST_REGEX_MATCH_EXTRA defined, and you must pass the flag <A href="match_flag_type.html">
-            match_extra</A> to the regex matching functions (<A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, <A href="regex_iterator.html">regex_iterator</A>
-         or <A href="regex_token_iterator.html">regex_token_iterator</A>) in order for 
-         this member function to be defined and return useful information.</P>
-      <P><STRONG>Rationale:</STRONG> Enabling this feature has several consequences:
-      </P>
-      <UL>
-         <LI>
-         sub_match occupies more memory resulting in complex expressions running out of 
-         memory or stack space more quickly during matching.
-         <LI>
-         The matching algorithms are less efficient at handling some features 
-         (independent sub-expressions for example), even when match_extra is not used.
-         <LI>
-            The matching algorithms are much less efficient (i.e. slower), when match_extra 
-            is used.&nbsp; Mostly this is down to the extra memory allocations that have to 
-            take place.</LI></UL>
-      <h4>match_results non-members</h4>
-      <PRE><A name=n1></A>template &lt;class BidirectionalIterator, class Allocator&gt;
-bool operator == (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);</PRE>
-      <P><B>Effects:</B> Compares the two sequences for equality.</P>
-      <PRE><A name=n2></A>template &lt;class BidirectionalIterator, class Allocator&gt;
-bool operator != (const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-                  const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);</PRE>
-      <P><B>Effects:</B> Compares the two sequences for inequality.</P>
-      <PRE><A name=n3></A>template &lt;class charT, class traits, class BidirectionalIterator, class Allocator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   operator &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os,
-                const match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m);</PRE>
-      <P><B>Effects:</B> Writes the contents of <EM>m</EM> to the stream <EM>os</EM> as 
-         if by calling <code>os &lt;&lt; m.str();</code> Returns <EM>os</EM>..</P>
-      <PRE><A name=n4></A>template &lt;class BidirectionalIterator, class Allocator&gt;
-void swap(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
-          match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m2);</PRE>
-      <P><B>Effects:</B> Swaps the contents of the two sequences.</P>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/mfc_strings.html b/doc/mfc_strings.html
deleted file mode 100644
index f1d733b7..00000000
--- a/doc/mfc_strings.html
+++ /dev/null
@@ -1,294 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Working With MFC/ATL String Types</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Working With MFC/ATL String Types.</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#intro">Introduction</A> <dt><A href="#types">Types</A> <dt><A href="#create">Regular 
-                     Expression Creation</A> <dt><A href="#algo">Overloaded Algorithms</A>
-                     <dd>
-                        <dl>
-                           <dt><A href="#regex_match">regex_match</A> <dt><A href="#regex_search">regex_search</A>
-                                 <dt><A href="#regex_replace">regex_replace</A> </dt>
-                        </dl>
-                        <dt><A href="#iterators">Iterators</A>
-                           <dd>
-                              <dl>
-                                 <dt><A href="#regex_iterator">regex_iterator creation helper</A> <dt><A href="#regex_token_iterator">
-                                          regex_token_iterator creation helpers</A></dt>
-                              </dl>
-                           </dd>
-      </dl>
-      <H3><a name="intro"></a>Introduction</H3>
-      <P>The header &lt;boost/regex/mfc.hpp&gt; provides Boost.Regex support for MFC 
-         string types: note that this support requires Visual Studio .NET (Visual C++ 7) 
-         or later, where all of the MFC and ATL string types are based around 
-         the&nbsp;CSimpleStringT class template.&nbsp;</P>
-      <P>In the following documentation, whenever you see CSimpleStringT&lt;charT&gt;, 
-         then you can substitute any of the following MFC/ATL types (all of which 
-         inherit from&nbsp;CSimpleStringT):</P>
-      <P>CString<BR>
-         CStringA<BR>
-         CStringW<BR>
-         CAtlString<BR>
-         CAtlStringA<BR>
-         CAtlStringW<BR>
-         CStringT&lt;charT,traits&gt;<BR>
-         CFixedStringT&lt;charT,N&gt;<BR>
-         CSimpleStringT&lt;charT&gt;</B></P>
-      <H3><A name="types"></A>Types</H3>
-      <P>The following typedefs are provided for the convenience of those working with 
-         TCHAR's:</P>
-      <PRE>typedef <A href="basic_regex.html" >basic_regex</A>&lt;TCHAR&gt; tregex; 
-typedef <A href="match_results.html" >match_results</A>&lt;TCHAR const*&gt; tmatch; 
-typedef <A href="regex_iterator.html" >regex_iterator</A>&lt;TCHAR const*&gt; tregex_iterator; 
-typedef <A href="regex_token_iterator.html" >regex_token_iterator</A>&lt;TCHAR const*&gt; tregex_token_iterator; 
-</PRE>
-      <P>If you are working with explicitly narrow or wide characters rather than TCHAR, 
-         then use the regular Boost.Regex types instead.</P>
-      <H3><A name="create"></A>Regular Expression Creation</H3>
-      <P>The following helper function is available to assist in the creation of a 
-         regular expression from an MFC/ATL string type:</P>
-      <pre>template &lt;class charT&gt;
-basic_regex&lt;charT&gt; 
-   make_regex(const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-              ::boost::regex_constants::syntax_option_type f = boost::regex_constants::normal);</pre>
-      <P><STRONG>Effects</STRONG>: returns basic_regex&lt;charT&gt;(s.GetString(), 
-         s.GetString() + s.GetLength(), f);</P>
-      <H3><A name="algo"></A>Overloaded Algorithms</H3>
-      <P>For each regular expression algorithm that's overloaded for a std::basic_string 
-         argument, there is also one overloaded for the MFC/ATL string types.&nbsp; 
-         These algorithm signatures&nbsp;all look a lot more complex than they actually 
-         are, but for completeness here they are anyway:</P>
-      <H4><A name="regex_match"></A>regex_match</H4>
-      <P>There are two overloads, the first reports what matched in a match_results 
-         structure, the second does not.&nbsp;
-      </P>
-      <P>All the usual caveats for <A href="regex_match.html">regex_match</A> apply, in 
-         particular the algorithm will only report a successful match if <STRONG>all of the 
-            input text matches the expression</STRONG>, if this isn't what you want then 
-         use <A href="regex_search.html">regex_search</A> instead.</P>
-      <PRE>template &lt;class charT, class T, class A&gt;
-bool regex_match(
-   const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-   match_results&lt;const B*, A&gt;&amp; what, 
-   const basic_regex&lt;charT, T&gt;&amp; e, 
-   boost::regex_constants::match_flag_type f = boost::regex_constants::match_default); </PRE>
-      <P>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_match.html">regex_match</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), what, e, f);</P>
-      <p><strong>Example:</strong></p>
-      <pre>//
-// Extract filename part of a path from a CString and return the result
-// as another CString:
-//
-CString get_filename(const CString&amp; 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));
-   }
-   else
-   {
-      throw std::runtime_error("Invalid pathname");
-   }
-}
-      </pre>
-      <hr>
-      <PRE>template &lt;class charT, class T&gt;
-bool regex_match(
-   const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-   const basic_regex&lt;B, T&gt;&amp; e,
-   boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)</PRE>
-      <P>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_match.html">regex_match</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, f);</P>
-      <p><strong>Example:</strong></p>
-      <pre>//
-// Find out if *password* meets our password requirements,
-// as defined by the regular expression *requirements*.
-//
-bool is_valid_password(const CString&amp; password, const CString&amp; requirements)
-{
-   return boost::regex_match(password, boost::make_regex(requirements));
-}      </pre>
-      <hr>
-      <H4><A name="regex_search"></A>regex_search</H4>
-      <P>There are two additional overloads for <A href="regex_search.html">regex_search</A>, 
-         the first reports what matched the second does not:</P>
-      <PRE>template &lt;class charT, class A, class T&gt;
-bool regex_search(const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-                  match_results&lt;const charT*, A&gt;&amp; what,
-                  const basic_regex&lt;charT, T&gt;&amp; e,
-                  boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)</PRE>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_search.html">regex_search</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), what, e, f);</P>
-      <P><STRONG>Example:</STRONG>: Postcode extraction from an address string.</P>
-      <pre>CString extract_postcode(const CString&amp; 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})$"));
-   boost::tmatch what;
-   if(boost::regex_search(address, what, r))
-   {
-      // extract $0 as a CString:
-      return CString(what[0].first, what.length());
-   }
-   else
-   {
-      throw std::runtime_error("No postcode found");
-   }
-}      </pre>
-      <hr>
-      <pre>template &lt;class charT, class T&gt;
-inline bool regex_search(const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-                 const basic_regex&lt;charT, T&gt;&amp; e,
-                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
-</pre>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_search.html">regex_search</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, f);</P>
-      <hr>
-      <H4><A name="regex_replace"></A>regex_replace</H4>
-      <P>There are two additional overloads for <A href="regex_replace.html">regex_replace</A>, 
-         the first sends output to an output iterator, while the second creates a new 
-         string</P>
-      <PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class
-          charT&gt;
-OutputIterator regex_replace(OutputIterator out,
-                           BidirectionalIterator first,
-                           BidirectionalIterator last,
-                           const basic_regex&lt;charT, traits&gt;&amp; e,
-                           const ATL::CSimpleStringT&lt;charT&gt;&amp; fmt,
-                           match_flag_type flags = match_default)
-</PRE>
-      <P><STRONG>Effects</STRONG>: returns ::boost::<A href="regex_replace.html">regex_replace</A>(out, 
-         first, last, e, fmt.GetString(), flags);</P>
-      <pre>template &lt;class traits, charT&gt;
-ATL::CSimpleStringT&lt;charT&gt; regex_replace(const ATL::CSimpleStringT&lt;charT&gt;&amp; s,
-                            const basic_regex&lt;charT, traits&gt;&amp; e,
-                            const ATL::CSimpleStringT&lt;charT&gt;&amp; fmt,
-                            match_flag_type flags = match_default)</pre>
-      <P><STRONG>Effects</STRONG>: returns a new string created using <A href="regex_replace.html">
-            regex_replace</A>, and the same memory manager as string <EM>s</EM>.</P>
-      <P><STRONG>Example:</STRONG></P>
-      <PRE>//
-// 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&amp; s)
-{
-   return boost::regex_replace(s, e, human_format);
-}
-      </PRE>
-      <H3><a name="iterators"></a>Iterators</H3>
-      <P>The following helper functions are provided to ease the conversion from an 
-         MFC/ATL string to a <A href="regex_iterator.html">regex_iterator</A> or <A href="regex_token_iterator.html">
-            regex_token_iterator</A>:</P>
-      <H4><A name="regex_iterator"></A>regex_iterator creation helper</H4>
-      <PRE>template &lt;class charT&gt;
-regex_iterator&lt;charT const*&gt; 
-   make_regex_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</PRE>
-      <p><STRONG>Effects:</STRONG>returns <A href="regex_iterator.html">regex_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, f);</p>
-      <p><strong>Example:</strong></p>
-      <pre>void enumerate_links(const CString&amp; html)
-{
-   // enumerate and print all the <a> links in some HTML text,
-   // the expression used is by Andew Lee on <a href="http://www.regxlib.com">www.regxlib.com</a>:
-   boost::tregex r(__T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*(\\/|\\?\\w*=\\w*(&amp;\\w*=\\w*)*)?)[\"\']"));
-   boost::tregex_iterator i(boost::make_regex_iterator(html, r)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; (*i)[1] &lt;&lt; std::endl;
-      ++i;
-   }
-}
-      </pre>
-      <hr>
-      <H4><A name="regex_token_iterator"></A>regex_token_iterator creation helpers</H4>
-      <PRE>template &lt;class charT&gt; 
-regex_token_iterator&lt;charT const*&gt; 
-   make_regex_token_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      int sub = 0, 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</PRE>
-      <p><STRONG>Effects:</STRONG>returns <A href="regex_token_iterator.html">regex_token_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, sub, f);</p>
-      <pre>template &lt;class charT&gt; 
-regex_token_iterator&lt;charT const*&gt; 
-   make_regex_token_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      const std::vector&lt;int&gt;&amp; subs, 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</pre>
-      <p><STRONG>Effects:</STRONG>returns <A href="regex_token_iterator.html">regex_token_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, subs, f);</p>
-      <pre>template &lt;class charT, std::size_t N&gt; 
-regex_token_iterator&lt;charT const*&gt; 
-   make_regex_token_iterator(
-      const ATL::CSimpleStringT&lt;charT&gt;&amp; s, 
-      const basic_regex&lt;charT&gt;&amp; e, 
-      const int (&amp; subs)[N], 
-      ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
-</pre>
-      <p><STRONG>Effects: </STRONG>returns <A href="regex_token_iterator.html">regex_token_iterator</A>(s.GetString(), 
-         s.GetString() + s.GetLength(), e, subs, f);</p>
-      <P><STRONG>Example:</STRONG></P>
-      <PRE>void enumerate_links2(const CString&amp; html)
-{
-   // enumerate and print all the <a> links in some HTML text,
-   // the expression used is by Andew Lee on <a href="http://www.regxlib.com">www.regxlib.com</a>:
-   boost::tregex r(__T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*(\\/|\\?\\w*=\\w*(&amp;\\w*=\\w*)*)?)[\"\']"));
-   boost::tregex_token_iterator i(boost::make_regex_token_iterator(html, r, 1)), j;
-   while(i != j)
-   {
-      std::cout &lt;&lt; *i &lt;&lt; std::endl;
-      ++i;
-   }
-}      </PRE>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21&nbsp;Dec 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/mfc_strings.qbk b/doc/mfc_strings.qbk
new file mode 100644
index 00000000..8d70fec4
--- /dev/null
+++ b/doc/mfc_strings.qbk
@@ -0,0 +1,295 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:mfc_strings Using Boost Regex With MFC Strings]
+
+[section:mfc_intro Introduction to Boost.Regex and MFC Strings]
+
+The header `<boost/regex/mfc.hpp>` provides Boost.Regex support for MFC string 
+types: note that this support requires Visual Studio .NET (Visual C++ 7) or 
+later, where all of the MFC and ATL string types are based around the 
+CSimpleStringT class template. 
+
+In the following documentation, whenever you see 
+CSimpleStringT<charT>, then you can substitute any of the following 
+MFC/ATL types (all of which inherit from CSimpleStringT):
+
+   CString
+   CStringA
+   CStringW
+   CAtlString
+   CAtlStringA
+   CAtlStringW
+   CStringT<charT,traits>
+   CFixedStringT<charT,N>
+   CSimpleStringT<charT>
+
+[endsect]
+[section:mfc_regex_types Regex Types Used With MFC Strings]
+
+The following typedefs are provided for the convenience of those working with 
+TCHAR's:
+
+   typedef basic_regex<TCHAR>                  tregex; 
+   typedef match_results<TCHAR const*>         tmatch; 
+   typedef regex_iterator<TCHAR const*>        tregex_iterator; 
+   typedef regex_token_iterator<TCHAR const*>  tregex_token_iterator; 
+
+If you are working with explicitly narrow or wide characters rather than 
+TCHAR, then use the regular Boost.Regex types `regex` and `wregex` instead.
+
+[endsect]
+[section:mfc_regex_create Regular Expression Creation From an MFC String]
+
+The following helper function is available to assist in the creation of a 
+regular expression from an MFC/ATL string type:
+
+   template <class charT>
+   basic_regex<charT> 
+      make_regex(const ATL::CSimpleStringT<charT>& s, 
+               ::boost::regex_constants::syntax_option_type f = boost::regex_constants::normal);
+
+[*Effects]: returns `basic_regex<charT>(s.GetString(), s.GetString() + s.GetLength(), f);`
+
+[endsect]
+[section:mfc_algo Overloaded Algorithms For MFC String Types]
+
+For each regular expression algorithm that's overloaded for a `std::basic_string` 
+argument, there is also one overloaded for the MFC/ATL string types.  These 
+algorithm signatures all look a lot more complex than they actually are, 
+but for completeness here they are anyway:
+
+[h4 regex_match]
+
+There are two overloads, the first reports what matched in a match_results 
+structure, the second does not. 
+
+All the usual caveats for [regex_match] apply, in particular the algorithm 
+will only report a successful match if all of the input text matches the 
+expression, if this isn't what you want then use [regex_search] instead.
+
+   template <class charT, class T, class A>
+   bool regex_match(
+      const ATL::CSimpleStringT<charT>& s, 
+      match_results<const B*, A>& what, 
+      const basic_regex<charT, T>& e, 
+      boost::regex_constants::match_flag_type f = boost::regex_constants::match_default); 
+
+[*Effects]: returns `::boost::regex_match(s.GetString(), s.GetString() + s.GetLength(), what, e, f);`
+
+[*Example:]
+
+   //
+   // 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));
+      }
+      else
+      {
+         throw std::runtime_error("Invalid pathname");
+      }
+   }
+      
+[h4 regex_match (second overload)]
+
+   template <class charT, class T>
+   bool regex_match(
+      const ATL::CSimpleStringT<charT>& s,
+      const basic_regex<B, T>& e,
+      boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+
+[*Effects]: returns `::boost::regex_match(s.GetString(), s.GetString() + s.GetLength(), e, f);`
+
+[*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)
+   {
+      return boost::regex_match(password, boost::make_regex(requirements));
+   }      
+
+[h4 regex_search]
+
+There are two additional overloads for [regex_search], the first reports what 
+matched the second does not:
+
+   template <class charT, class A, class T>
+   bool regex_search(const ATL::CSimpleStringT<charT>& s,
+                     match_results<const charT*, A>& what,
+                     const basic_regex<charT, T>& e,
+                     boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+
+[*Effects]: returns ::boost::regex_search(s.GetString(), s.GetString() + s.GetLength(), what, e, f);
+
+[*Example]: Postcode extraction from an address string.
+
+   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})$"));
+      boost::tmatch what;
+      if(boost::regex_search(address, what, r))
+      {
+         // extract $0 as a CString:
+         return CString(what[0].first, what.length());
+      }
+      else
+      {
+         throw std::runtime_error("No postcode found");
+      }
+   }      
+
+[h4 regex_search (second overload)]
+
+   template <class charT, class T>
+   inline bool regex_search(const ATL::CSimpleStringT<charT>& s,
+                  const basic_regex<charT, T>& e,
+                  boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+
+[*Effects]: returns `::boost::regex_search(s.GetString(), s.GetString() + s.GetLength(), e, f);`
+
+[h4 regex_replace]
+
+There are two additional overloads for [regex_replace], the first sends output 
+to an output iterator, while the second creates a new string
+
+   template <class OutputIterator, class BidirectionalIterator, class traits, class
+            charT>
+   OutputIterator regex_replace(OutputIterator out,
+                              BidirectionalIterator first,
+                              BidirectionalIterator last,
+                              const basic_regex<charT, traits>& e,
+                              const ATL::CSimpleStringT<charT>& fmt,
+                              match_flag_type flags = match_default)
+
+[*Effects]: returns `::boost::regex_replace(out, first, last, e, fmt.GetString(), flags);`
+
+   template <class traits, charT>
+   ATL::CSimpleStringT<charT> regex_replace(const ATL::CSimpleStringT<charT>& s,
+                              const basic_regex<charT, traits>& e,
+                              const ATL::CSimpleStringT<charT>& fmt,
+                              match_flag_type flags = match_default)
+
+[*Effects]: returns a new string created using [regex_replace], and the same 
+memory manager as string /s/.
+
+[*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"));
+   const CString human_format = __T("$1-$2-$3-$4");
+
+   CString human_readable_card_number(const CString& s)
+   {
+      return boost::regex_replace(s, e, human_format);
+   }
+      
+[endsect]
+[section:mfc_iter Iterating Over the Matches Within An MFC String]
+
+The following helper functions are provided to ease the conversion from an 
+MFC/ATL string to a [regex_iterator] or [regex_token_iterator]:
+
+[h4 regex_iterator creation helper]
+
+   template <class charT>
+   regex_iterator<charT const*> 
+      make_regex_iterator(
+         const ATL::CSimpleStringT<charT>& s, 
+         const basic_regex<charT>& e, 
+         ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
+
+[*Effects]: returns `regex_iterator(s.GetString(), s.GetString() + s.GetLength(), e, f);`
+
+[*Example]:
+
+   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(
+         __T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+"
+             "(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*"
+             "(\\/|\\?\\w*=\\w*(&\\w*=\\w*)*)?)[\"\']"));
+      boost::tregex_iterator i(boost::make_regex_iterator(html, r)), j;
+      while(i != j)
+      {
+         std::cout << (*i)[1] << std::endl;
+         ++i;
+      }
+   }
+      
+
+[h4 regex_token_iterator creation helpers]
+
+   template <class charT> 
+   regex_token_iterator<charT const*> 
+      make_regex_token_iterator(
+         const ATL::CSimpleStringT<charT>& s, 
+         const basic_regex<charT>& e, 
+         int sub = 0, 
+         ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
+
+[*Effects]: returns `regex_token_iterator(s.GetString(), s.GetString() + s.GetLength(), e, sub, f);`
+
+   template <class charT> 
+   regex_token_iterator<charT const*> 
+      make_regex_token_iterator(
+         const ATL::CSimpleStringT<charT>& s, 
+         const basic_regex<charT>& e, 
+         const std::vector<int>& subs, 
+         ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
+
+[*Effects]: returns `regex_token_iterator(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);`
+
+   template <class charT, std::size_t N> 
+   regex_token_iterator<charT const*> 
+      make_regex_token_iterator(
+         const ATL::CSimpleStringT<charT>& s, 
+         const basic_regex<charT>& e, 
+         const int (& subs)[N], 
+         ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default);
+
+[*Effects]: returns `regex_token_iterator(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);`
+
+[*Example]:
+
+   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(
+            __T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+"
+                "(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*"
+                "(\\/|\\?\\w*=\\w*(&\\w*=\\w*)*)?)[\"\']"));
+      boost::tregex_token_iterator i(boost::make_regex_token_iterator(html, r, 1)), j;
+      while(i != j)
+      {
+         std::cout << *i << std::endl;
+         ++i;
+      }
+   }      
+
+[endsect]
+[endsect]
+
diff --git a/doc/non_standard_strings.html b/doc/non_standard_strings.html
deleted file mode 100644
index 5196abcf..00000000
--- a/doc/non_standard_strings.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Working With Non-Standard String Types</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Working With Non-Standard String Types.</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The Boost.Regex algorithms and iterators are all iterator-based, with 
-         convenience overloads of the algorithms provided that convert standard library 
-         string types to iterator pairs internally.&nbsp; If you want to search a 
-         non-standard string type then the trick is to convert that string into an 
-         iterator pair: so far I haven't come across any string types that can't be 
-         handled this way, even if they're not officially iterator based.&nbsp; 
-         Certainly any string type that provides access to it's internal buffer, along 
-         with it's length, can be converted into a pair of pointers (which can be used 
-         as iterators).</P>
-      <P>Some non-standard string types are sufficiently common that wappers have been 
-         provided for them:</P>
-      <P><A href="mfc_strings.html">MFC/ATL Strings.</A><BR>
-         <A href="icu_strings.html">ICU Strings.</A></P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Nov 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/non_std_strings.qbk b/doc/non_std_strings.qbk
new file mode 100644
index 00000000..63851a77
--- /dev/null
+++ b/doc/non_std_strings.qbk
@@ -0,0 +1,30 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:non_std_strings Interfacing With Non-Standard String Types]
+
+The Boost.Regex algorithms and iterators are all iterator-based, 
+with convenience overloads of the algorithms provided that convert 
+standard library string types to iterator pairs internally.  If you want 
+to search a non-standard string type then the trick is to convert that string 
+into an iterator pair: so far I haven't come across any string types that 
+can't be handled this way, even if they're not officially iterator based.  
+Certainly any string type that provides access to it's internal buffer, along 
+with it's length, can be converted into a pair of pointers (which can be 
+used as iterators).
+
+Some non-standard string types are sufficiently common that wappers have been 
+provided for them already: currently this includes the ICU and MFC string class
+types.
+
+[include icu_strings.qbk]
+[include mfc_strings.qbk]
+
+[endsect]
+
+
+
diff --git a/doc/old_regex.qbk b/doc/old_regex.qbk
new file mode 100644
index 00000000..7e1e1ca8
--- /dev/null
+++ b/doc/old_regex.qbk
@@ -0,0 +1,283 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:old_regex High Level Class RegEx (Deprecated)]
+
+The high level wrapper class RegEx is now deprecated and does not form 
+part of the regular expression standardization proposal.  This type still 
+exists, and existing code will continue to compile, however the following 
+documentation is unlikely to be further updated.
+
+   #include <boost/cregex.hpp>
+
+The class RegEx provides a high level simplified interface to the regular 
+expression library, this class only handles narrow character strings, and 
+regular expressions always follow the "normal" syntax - that is the 
+same as the perl / ECMAScript synatx.
+
+   typedef bool (*GrepCallback)(const RegEx& expression);
+   typedef bool (*GrepFileCallback)(const char* file, const RegEx& expression);
+   typedef bool (*FindFilesCallback)(const char* file);
+
+   class  RegEx
+   {
+   public:
+      RegEx();
+      RegEx(const RegEx& o);
+      ~RegEx();
+      RegEx(const char* c, bool icase = false);
+      explicit RegEx(const std::string& s, bool icase = false);
+      RegEx& operator=(const RegEx& o);
+      RegEx& operator=(const char* p);
+      RegEx& operator=(const std::string& s);
+      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);
+      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); 
+      unsigned int Grep(GrepCallback cb, const char* p, 
+                        boost::match_flag_type flags = match_default); 
+      unsigned int Grep(GrepCallback cb, const std::string& s, 
+                        boost::match_flag_type flags = match_default); 
+      unsigned int Grep(std::vector<std::string>& v, const char* p, 
+                        boost::match_flag_type flags = match_default); 
+      unsigned int Grep(std::vector<std::string>& v, const std::string& s, 
+                        boost::match_flag_type flags = match_default); 
+      unsigned int Grep(std::vector<unsigned int>& v, const char* p, 
+                        boost::match_flag_type flags = match_default); 
+      unsigned int Grep(std::vector<unsigned int>& v, const std::string& s, 
+                        boost::match_flag_type flags = match_default); 
+      unsigned int GrepFiles(GrepFileCallback cb, const char* files, bool recurse = false, 
+                             boost::match_flag_type flags = match_default); 
+      unsigned int GrepFiles(GrepFileCallback cb, const std::string& files, 
+                             bool recurse = false, 
+                             boost::match_flag_type flags = match_default); 
+      unsigned int FindFiles(FindFilesCallback cb, const char* files, 
+                             bool recurse = false, 
+                             boost::match_flag_type flags = match_default); 
+      unsigned int FindFiles(FindFilesCallback cb, const std::string& files, 
+                             bool recurse = false, 
+                             boost::match_flag_type flags = match_default); 
+      std::string Merge(const std::string& in, const std::string& fmt, 
+                        bool copy = true, boost::match_flag_type flags = match_default); 
+      std::string Merge(const char* in, const char* fmt, bool copy = true, 
+                        boost::match_flag_type flags = match_default); 
+      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; 
+      unsigned int Length(int i = 0)const; 
+      bool Matched(int i = 0)const;
+      unsigned int Line()const; 
+      unsigned int Marks() const; 
+      std::string What(int i)const; 
+      std::string operator[](int i)const ; 
+
+      static const unsigned int npos;
+   };    
+
+Member functions for class RegEx are defined as follows:
+ 
+[table
+[[Member][Description]]
+[[`RegEx();`][Default constructor, constructs an instance of RegEx without any valid expression. 	 ]]
+[[`RegEx(const RegEx& o);`][Copy constructor, all the properties of parameter /o/ 
+         are copied. 	 ]]
+[[`RegEx(const char* c, bool icase = false);`][Constructs an instance of RegEx, 
+         setting the expression to /c/, if /icase/ is true then matching is 
+         insensitive to case, otherwise it is sensitive to case. Throws 
+         [bad_expression] on failure. 	 ]]
+[[`RegEx(const std::string& s, bool icase = false);`][Constructs an instance of 
+         RegEx, setting the expression to /s/, if /icase/ is true then matching 
+         is insensitive to case, otherwise it is sensitive to case. Throws 
+         [bad_expression] on failure. 	 ]]
+[[`RegEx& operator=(const RegEx& o);`][Default assignment operator. 	 ]]
+[[`RegEx& operator=(const char* p);`][Assignment operator, equivalent to calling 
+         `SetExpression(p, false)`. Throws [bad_expression] on failure. 	 ]]
+[[`RegEx& operator=(const std::string& s);`][Assignment operator, equivalent to 
+         calling `SetExpression(s, false)`. Throws [bad_expression] on failure. 	 ]]
+[[`unsigned int SetExpression(constchar* p, bool icase = false);`][Sets the 
+         current expression to /p/, if /icase/ is true then matching is 
+         insensitive to case, otherwise it is sensitive to case. 
+         Throws [bad_expression] on failure. 	 ]]
+[[`unsigned int SetExpression(const std::string& s, bool icase = false);`]
+         [Sets the current expression to /s/, if /icase/ is true then matching is 
+         insensitive to case, otherwise it is sensitive to case. Throws 
+         [bad_expression] on failure. 	 ]]
+[[`std::string Expression()const;`][Returns a copy of the current regular expression. 	 ]]
+[[`bool Match(const char* p, boost::match_flag_type flags = match_default);`]
+         [Attempts to match the current expression against the text /p/ using 
+         the match flags /flags/ - see [match_flag_type]. Returns /true/ if the 
+         expression matches the whole of the input string. 	 ]]
+[[`bool Match(const std::string& s, boost::match_flag_type flags = match_default);`]
+         [Attempts to match the current expression against the text /s/ using 
+         the [match_flag_type] /flags/. Returns /true/ if the expression matches 
+         the whole of the input string. 	 ]]
+[[`bool Search(const char* p, boost::match_flag_type flags = match_default);`]
+         [Attempts to find a match for the current expression somewhere in 
+         the text /p/ using the [match_flag_type] /flags/. Returns /true/ 
+         if the match succeeds. 	 ]]
+[[`bool Search(const std::string& s, boost::match_flag_type flags = match_default);`]
+         [Attempts to find a match for the current expression somewhere in the 
+         text /s/ using the [match_flag_type] flags. Returns /true/ if the 
+         match succeeds. 	 ]]
+[[`unsigned int Grep(GrepCallback cb, const char* p, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the text /p/ using the 
+         [match_flag_type] /flags/. For each match found calls the call-back 
+         function cb as: `cb(*this);`
+         If at any stage the call-back function returns /false/ then the grep 
+         operation terminates, otherwise continues until no further matches 
+         are found. Returns the number of matches found.]]
+[[`unsigned int Grep(GrepCallback cb, const std::string& s, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the text /s/ using the 
+         [match_flag_type] flags. For each match found calls the call-back 
+         function cb as: `cb(*this);`
+         If at any stage the call-back function returns false then the grep operation 
+         terminates, otherwise continues until no further matches are found. 
+         Returns the number of matches found.]]
+[[`unsigned int Grep(std::vector<std::string>& v, const char* p, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the text /p/ using the 
+         [match_flag_type] flags. For each match pushes a copy of what matched 
+         onto /v/. Returns the number of matches found. 	 ]]
+[[`unsigned int Grep(std::vector<std::string>& v, const std::string& s, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the text /s/ using the 
+         [match_flag_type] /flags/. For each match pushes a copy of what 
+         matched onto /v/. Returns the number of matches found. 	 ]]
+[[`unsigned int Grep(std::vector<unsigned int>& v, const char* p, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the text /p/ using the 
+         [match_flag_type] /flags/. For each match pushes the starting index of 
+         what matched onto /v/. Returns the number of matches found. 	 ]]
+[[`unsigned int Grep(std::vector<unsigned int>& v, const std::string& s, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the text /s/ using the 
+         [match_flag_type] /flags/. For each match pushes the starting index of what 
+         matched onto /v/. Returns the number of matches found. 	 ]]
+[[`unsigned int GrepFiles(GrepFileCallback cb, const char* files, bool recurse = false, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the files files using 
+         the [match_flag_type] /flags/. For each match calls the call-back function cb. 
+         If the call-back returns false then the algorithm returns without 
+         considering further matches in the current file, or any further files. 
+         
+         The parameter /files/ can include wild card characters '\*' and '\?', if 
+         the parameter recurse is true then searches sub-directories for matching 
+         file names. 
+
+         Returns the total number of matches found.
+
+         May throw an exception derived from `std::runtime_error` if file io fails.]]
+[[`unsigned int GrepFiles(GrepFileCallback cb, const std::string& files, bool recurse = false, boost::match_flag_type flags = match_default);`]
+         [Finds all matches of the current expression in the files files using the 
+         [match_flag_type] /flags/. For each match calls the call-back function cb. 
+
+         If the call-back returns false then the algorithm returns without 
+         considering further matches in the current file, or any further files. 
+
+         The parameter /files/ can include wild card characters '\*' and '\?', if 
+         the parameter recurse is true then searches sub-directories for 
+         matching file names. 
+
+         Returns the total number of matches found.
+
+         May throw an exception derived from `std::runtime_error` if file io fails.]]
+	 
+[[`unsigned int FindFiles(FindFilesCallback cb, const char* files, bool recurse = false, boost::match_flag_type flags = match_default);`]
+         [Searches files to find all those which contain at least one match of 
+         the current expression using the [match_flag_type] /flags/. For each 
+         matching file calls the call-back function cb. 
+         If the call-back returns false then the algorithm returns without 
+         considering any further files. 
+
+         The parameter /files/ can include wild card characters '\*' and '\?', if 
+         the parameter /recurse/ is true then searches sub-directories for 
+         matching file names. 
+
+         Returns the total number of files found.
+
+         May throw an exception derived from `std::runtime_error` if file io fails.]]
+[[`unsigned int FindFiles(FindFilesCallback cb, const std::string& files, bool recurse = false, boost::match_flag_type flags = match_default);`]
+         [Searches files to find all those which contain at least one 
+         match of the current expression using the [match_flag_type] /flags/. 
+         For each matching file calls the call-back function cb. 
+
+         If the call-back returns false then the algorithm returns without 
+         considering any further files. 
+
+         The parameter /files/ can include wild card characters '\*' and '\?', if 
+         the parameter /recurse/ is true then searches sub-directories for 
+         matching file names. 
+
+         Returns the total number of files found.
+
+         May throw an exception derived from `std::runtime_error` if file io fails.]]
+         
+[[`std::string Merge(const std::string& in, const std::string& fmt, bool copy = true, boost::match_flag_type flags = match_default);`]
+         [Performs a search and replace operation: searches through the 
+         string /in/ for all occurrences of the current expression, for each 
+         occurrence replaces the match with the format string /fmt/. Uses /flags/ 
+         to determine what gets matched, and how the format string should be 
+         treated. If /copy/ is true then all unmatched sections of input are 
+         copied unchanged to output, if the flag /format_first_only/ is set then 
+         only the first occurance of the pattern found is replaced. 
+         Returns the new string. See also 
+         [link boost_regex.format format string syntax], and [match_flag_type].]]
+[[`std::string Merge(const char* in, const char* fmt, bool copy = true, boost::match_flag_type flags = match_default);`]
+         [Performs a search and replace operation: searches through the string /in/ 
+         for all occurrences of the current expression, for each occurrence 
+         replaces the match with the format string /fmt/. Uses /flags/ to determine 
+         what gets matched, and how the format string should be treated. 
+         If /copy/ is true then all unmatched sections of input are copied 
+         unchanged to output, if the flag /format_first_only/ is set then only 
+         the first occurance of the pattern found is replaced. Returns 
+         the new string. See also [link boost_regex.format format string syntax], and [match_flag_type].]]
+[[`unsigned Split(std::vector<std::string>& v, std::string& s, boost::match_flag_type flags = match_default, unsigned max_count = ~0);`]
+         [Splits the input string and pushes each one onto the vector. 
+         If the expression contains no marked sub-expressions, then one 
+         string is outputted for each section of the input that does not 
+         match the expression. If the expression does contain marked 
+         sub-expressions, then outputs one string for each marked 
+         sub-expression each time a match occurs. Outputs no more than 
+         /max_count/ strings. Before returning, deletes from the input string 
+         /s/ all of the input that has been processed (all of the string if 
+         /max_count/ was not reached). Returns the number of strings pushed 
+         onto the vector. 	 ]]
+[[`unsigned int Position(int i = 0)const;`]
+         [Returns the position of what matched sub-expression /i/. If `i = 0` 
+         then returns the position of the whole match. Returns `RegEx::npos` if 
+         the supplied index is invalid, or if the specified sub-expression 
+         did not participate in the match. 	 ]]
+[[`unsigned int Length(int i = 0)const;`]
+         [Returns the length of what matched sub-expression i. If `i = 0` then 
+         returns the length of the whole match. Returns `RegEx::npos` if the 
+         supplied index is invalid, or if the specified sub-expression did not 
+         participate in the match. 	 ]]
+[[`bool Matched(int i = 0)const;`]
+         [Returns true if sub-expression /i/ was matched, false otherwise. 	 ]]
+[[`unsigned int Line()const;`][Returns the line on which the match occurred, 
+         indexes start from 1 not zero, if no match occurred then returns `RegEx::npos`. 	 ]]
+[[`unsigned int Marks() const;`][Returns the number of marked sub-expressions 
+         contained in the expression. Note that this includes the whole 
+         match (sub-expression zero), so the value returned is always >= 1. 	 ]]
+[[`std::string What(int i)const;`]
+         [Returns a copy of what matched sub-expression /i/. If `i = 0` then 
+         returns a copy of the whole match. Returns a null string if the 
+         index is invalid or if the specified sub-expression did not 
+         participate in a match. 	 ]]
+[[`std::string operator[](int i)const ;`][Returns `what(i);`
+         Can be used to simplify access to sub-expression matches, and make 
+         usage more perl-like.]]
+]
+
+[endsect]
+
diff --git a/doc/partial_matches.html b/doc/partial_matches.html
deleted file mode 100644
index f523fc9a..00000000
--- a/doc/partial_matches.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Partial Matches</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Partial Matches</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The <A href="match_flag_type.html">match-flag</A> <CODE>match_partial</CODE> can 
-         be passed to the following algorithms: <A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, and <A href="regex_grep.html">regex_grep</A>, 
-         and used with the iterator <A href="regex_iterator.html">regex_iterator</A>. 
-         When used it indicates that partial as well as full matches should be found. A 
-         partial match is one that matched one or more characters at the end of the text 
-         input, but did not match all of the regular expression (although it may have 
-         done so had more input been available). Partial matches are typically used when 
-         either validating data input (checking each character as it is entered on the 
-         keyboard), or when searching texts that are either too long to load into memory 
-         (or even into a memory mapped file), or are of indeterminate length (for 
-         example the source may be a socket or similar). Partial and full matches can be 
-         differentiated as shown in the following table (the variable M represents an 
-         instance of <A href="match_results.html">match_results&lt;&gt;</A> as filled in 
-         by regex_match, regex_search or regex_grep):<BR>
-      </P>
-      <P>
-         <TABLE id="Table2" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD vAlign="top" width="20%">&nbsp;</TD>
-               <TD vAlign="top" width="20%">Result</TD>
-               <TD vAlign="top" width="20%">M[0].matched</TD>
-               <TD vAlign="top" width="20%">M[0].first</TD>
-               <TD vAlign="top" width="20%">M[0].second</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="20%">No match</TD>
-               <TD vAlign="top" width="20%">False</TD>
-               <TD vAlign="top" width="20%">Undefined</TD>
-               <TD vAlign="top" width="20%">Undefined</TD>
-               <TD vAlign="top" width="20%">Undefined</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="20%">Partial match</TD>
-               <TD vAlign="top" width="20%">True</TD>
-               <TD vAlign="top" width="20%">False</TD>
-               <TD vAlign="top" width="20%">Start of partial match.</TD>
-               <TD vAlign="top" width="20%">End of partial match (end of text).</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="20%">Full match</TD>
-               <TD vAlign="top" width="20%">True</TD>
-               <TD vAlign="top" width="20%">True</TD>
-               <TD vAlign="top" width="20%">Start of full match.</TD>
-               <TD vAlign="top" width="20%">End of full match.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>Be aware that using partial matches can sometimes result in somewhat imperfect 
-         behavior:</P>
-      <UL>
-         <LI>
-            There are some expressions, such as ".*abc" that will always produce a partial 
-            match.&nbsp; 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.</LI>
-         <LI>
-            Boost.Regex currently prefers leftmost matches to full matches, so for example 
-            matching "abc|b" against "ab" produces a partial match&nbsp;against the "ab" 
-            rather than a full match against "b".&nbsp; It's more efficient to work this 
-            way, but may not be the behavior you want in all situations.</LI></UL>
-      <P>The following <A href="../example/snippets/partial_regex_match.cpp">example</A> 
-         tests to see whether the text could be a valid credit card number, as the user 
-         presses a key, the character entered would be added to the string being built 
-         up, and passed to <CODE>is_possible_card_number</CODE>. If this returns true 
-         then the text could be a valid card number, so the user interface's OK button 
-         would be enabled. If it returns false, then this is not yet a valid card 
-         number, but could be with more input, so the user interface would disable the 
-         OK button. Finally, if the procedure throws an exception the input could never 
-         become a valid number, and the inputted character must be discarded, and a 
-         suitable error indication displayed to the user.</P>
-      <PRE>#include &lt;string&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/regex.hpp&gt;
-
-boost::regex e("(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})");
-
-bool is_possible_card_number(const std::string&amp; 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&lt;std::string::const_iterator&gt; 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("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)
-   {
-      // excellent, we have a result:
-      return true;
-   }
-   // what we have so far is only a partial match...
-   return false;
-}</PRE>
-      <P>In the following <A href="../example/snippets/partial_regex_grep.cpp">example</A>, 
-         text input is taken from a stream containing an unknown amount of text; this 
-         example simply counts the number of html tags encountered in the stream. The 
-         text is loaded into a buffer and searched a part at a time, if a partial match 
-         was encountered, then the partial match gets searched a second time as the 
-         start of the next batch of text:</P>
-      <PRE>#include &lt;iostream&gt;
-#include &lt;fstream&gt;
-#include &lt;sstream&gt;
-#include &lt;string&gt;
-#include &lt;boost/regex.hpp&gt;
-
-// match some kind of html tag:
-boost::regex e("&lt;[^&gt;]*&gt;");
-// count how many:
-unsigned int tags = 0;
-// saved position of partial match:
-char* next_pos = 0;
-
-bool grep_callback(const boost::match_results&lt;char*&gt;&amp; m)
-{
-   if(m[0].matched == false)
-   {
-      // save position and return:
-      next_pos = m[0].first;
-   }
-   else
-      ++tags;
-   return true;
-}
-
-void search(std::istream&amp; is)
-{
-   char buf[4096];
-   next_pos = buf + sizeof(buf);
-   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:
-      memcpy(buf, next_pos, leftover);
-      // fill the rest from the stream:
-      unsigned read = is.readsome(buf + leftover, size);
-      // check to see if we've run out of text:
-      have_more = read == size;
-      // reset next_pos:
-      next_pos = buf + sizeof(buf);
-      // and then grep:
-      boost::regex_grep(grep_callback,
-                        buf,
-                        buf + read + leftover,
-                        e,
-                        boost::match_default | boost::match_partial);
-   }
-}</PRE>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/partial_matches.qbk b/doc/partial_matches.qbk
new file mode 100644
index 00000000..65801b2c
--- /dev/null
+++ b/doc/partial_matches.qbk
@@ -0,0 +1,149 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:partial_matches Partial Matches]
+
+The [match_flag_type] `match_partial` can be passed to the following algorithms: 
+[regex_match], [regex_search], and [regex_grep], and used with the 
+iterator [regex_iterator]. When used it indicates that partial as 
+well as full matches should be found. A partial match is one that 
+matched one or more characters at the end of the text input, but 
+did not match all of the regular expression (although it may have done 
+so had more input been available). Partial matches are typically used 
+when either validating data input (checking each character as it is 
+entered on the keyboard), or when searching texts that are either too long 
+to load into memory (or even into a memory mapped file), or are of 
+indeterminate length (for example the source may be a socket or similar). 
+Partial and full matches can be differentiated as shown in the following 
+table (the variable M represents an instance of [match_results] as filled in 
+by [regex_match], [regex_search] or [regex_grep]):
+
+[table
+[[ ][Result][M\[0\].matched][M\[0\].first][M\[0\].second]]
+[[No match][False][Undefined][Undefined][Undefined]]
+[[Partial match][True][False][Start of partial match.][End of partial match (end of text).]]
+[[Full match][True][True][Start of full match.][End of full match.]]
+]
+
+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".  It's more efficient to work this way, but may not be the behavior you want in all situations.
+
+The following example tests to see whether the text could be a valid 
+credit card number, as the user presses a key, the character entered 
+would be added to the string being built up, and passed to `is_possible_card_number`. 
+If this returns true then the text could be a valid card number, so the 
+user interface's OK button would be enabled. If it returns false, then 
+this is not yet a valid card number, but could be with more input, so 
+the user interface would disable the OK button. Finally, if the procedure 
+throws an exception the input could never become a valid number, and the 
+inputted character must be discarded, and a suitable error indication 
+displayed to the user.
+
+   #include <string>
+   #include <iostream>
+   #include <boost/regex.hpp>
+
+   boost::regex e("(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})");
+
+   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;
+      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(
+            "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)
+      {
+         // excellent, we have a result:
+         return true;
+      }
+      // what we have so far is only a partial match...
+      return false;
+   }
+
+In the following example, text input is taken from a stream containing an 
+unknown amount of text; this example simply counts the number of html tags 
+encountered in the stream. The text is loaded into a buffer and searched a 
+part at a time, if a partial match was encountered, then the partial match 
+gets searched a second time as the start of the next batch of text:
+
+   #include <iostream>
+   #include <fstream>
+   #include <sstream>
+   #include <string>
+   #include <boost/regex.hpp>
+
+   // 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;
+
+      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);
+         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(
+            buf, 
+            buf + read + leftover, 
+            e, 
+            boost::match_default | boost::match_partial); 
+         boost::cregex_iterator b;
+
+         while(a != b)
+         {
+            if((*a)[0].matched == false)
+            {
+               // Partial match, save position and break:
+               next_pos = (*a)[0].first;
+               break;
+            }
+            else
+            {
+               // full match:
+               ++tags;
+            }
+            
+            // move to next match:
+            ++a;
+         }
+      }
+   }
+
+[endsect]
+
+
+
diff --git a/doc/performance.html b/doc/performance.html
deleted file mode 100644
index c7897ff3..00000000
--- a/doc/performance.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Performance</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Performance</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The performance of Boost.regex in both recursive and non-recursive modes should 
-         be broadly comparable to other regular expression libraries: recursive mode is 
-         slightly faster (especially where memory allocation requires thread 
-         synchronisation), but not by much.&nbsp; The following pages compare 
-         Boost.regex with various other regular expression libraries for the following 
-         compilers:</P>
-      <P><A href="vc71-performance.html">Visual Studio.Net 2003 (recursive Boost.regex 
-            implementation)</A>.</P>
-      <P><A href="gcc-performance.html">Gcc 3.2 (cygwin) (non-recursive Boost.regex 
-            implementation).</A></P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/performance.qbk b/doc/performance.qbk
new file mode 100644
index 00000000..47d72779
--- /dev/null
+++ b/doc/performance.qbk
@@ -0,0 +1,23 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:performance Performance]
+
+The performance of Boost.Regex in both recursive and non-recursive modes 
+should be broadly comparable to other regular expression libraries: 
+recursive mode is slightly faster (especially where memory allocation requires 
+thread synchronisation), but not by much.  The following pages compare 
+Boost.Regex with various other regular expression libraries for the 
+following compilers:
+
+* [@../vc71-performance.html Visual Studio.Net 2003 (recursive Boost.Regex implementation)].
+* [@../gcc-performance.html Gcc 3.2 (cygwin) (non-recursive Boost.Regex implementation)].
+
+[endsect]
+
+
+
diff --git a/doc/posix_api.html b/doc/posix_api.html
deleted file mode 100644
index 967b8407..00000000
--- a/doc/posix_api.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: POSIX API Compatibility Functions</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">POSIX API Compatibility Functions</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <PRE>#include &lt;boost/cregex.hpp&gt;
-<I>or</I>:
-#include &lt;boost/regex.h&gt;</PRE>
-      <P>The following functions are available for users who need a POSIX compatible C 
-         library, they are available in both Unicode and narrow character versions, the 
-         standard POSIX API names are macros that expand to one version or the other 
-         depending upon whether UNICODE is defined or not.
-      </P>
-      <P><B>Important</B>: Note that all the symbols defined here are enclosed inside 
-         namespace <I>boost</I> when used in C++ programs, unless you use #include 
-         &lt;boost/regex.h&gt; instead - in which case the symbols are still defined in 
-         namespace boost, but are made available in the global namespace as well.</P>
-      <P>The functions are defined as:
-      </P>
-      <PRE>extern "C" {
-<B>int</B> regcompA(regex_tA*, <B>const</B> <B>char</B>*, <B>int</B>);
-<B>unsigned</B> <B>int</B> regerrorA(<B>int</B>, <B>const</B> regex_tA*, <B>char</B>*, <B>unsigned</B> <B>int</B>);
-<B>int</B> regexecA(<B>const</B> regex_tA*, <B>const</B> <B>char</B>*, <B>unsigned</B> <B>int</B>, regmatch_t*, <B>int</B>);
-<B>void</B> regfreeA(regex_tA*);
-
-<B>int</B> regcompW(regex_tW*, <B>const</B> <B>wchar_t</B>*, <B>int</B>);
-<B>unsigned</B> <B>int</B> regerrorW(<B>int</B>, <B>const</B> regex_tW*, <B>wchar_t</B>*, <B>unsigned</B> <B>int</B>);
-<B>int</B> regexecW(<B>const</B> regex_tW*, <B>const</B> <B>wchar_t</B>*, <B>unsigned</B> <B>int</B>, regmatch_t*, <B>int</B>);
-<B>void</B> regfreeW(regex_tW*);
-
-#ifdef UNICODE
-#define regcomp regcompW
-#define regerror regerrorW
-#define regexec regexecW
-#define regfree regfreeW
-#define regex_t regex_tW
-#else
-#define regcomp regcompA
-#define regerror regerrorA
-#define regexec regexecA
-#define regfree regfreeA
-#define regex_t regex_tA
-#endif
-}</PRE>
-      <P>All the functions operate on structure <B>regex_t</B>, which exposes two public 
-         members:
-      </P>
-      <P><B>unsigned int re_nsub</B> this is filled in by <B>regcomp</B> and indicates 
-         the number of sub-expressions contained in the regular expression.
-      </P>
-      <P><B>const TCHAR* re_endp</B> points to the end of the expression to compile when 
-         the flag REG_PEND is set.
-      </P>
-      <P><I>Footnote: regex_t is actually a #define - it is either regex_tA or regex_tW 
-            depending upon whether UNICODE is defined or not, TCHAR is either char or 
-            wchar_t again depending upon the macro UNICODE.</I>
-      </P>
-      <H3>regcomp</H3>
-      <P><B>regcomp</B> takes a pointer to a <B>regex_t</B>, a pointer to the expression 
-         to compile and a flags parameter which can be a combination of:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table2" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_EXTENDED</TD>
-               <TD vAlign="top" width="45%">Compiles modern regular expressions. Equivalent to 
-                  regbase::char_classes | regbase::intervals | regbase::bk_refs.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_BASIC</TD>
-               <TD vAlign="top" width="45%">Compiles basic (obsolete) regular expression syntax. 
-                  Equivalent to regbase::char_classes | regbase::intervals | regbase::limited_ops 
-                  | regbase::bk_braces | regbase::bk_parens | regbase::bk_refs.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NOSPEC</TD>
-               <TD vAlign="top" width="45%">All characters are ordinary, the expression is a 
-                  literal string.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_ICASE</TD>
-               <TD vAlign="top" width="45%">Compiles for matching that ignores character case.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NOSUB</TD>
-               <TD vAlign="top" width="45%">Has no effect in this library.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NEWLINE</TD>
-               <TD vAlign="top" width="45%">When this flag is set a dot does not match the 
-                  newline character.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_PEND</TD>
-               <TD vAlign="top" width="45%">When this flag is set the re_endp parameter of the 
-                  regex_t structure must point to the end of the regular expression to compile.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NOCOLLATE</TD>
-               <TD vAlign="top" width="45%">When this flag is set then locale dependent collation 
-                  for character ranges is turned off.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_ESCAPE_IN_LISTS<BR>
-                  , , ,
-               </TD>
-               <TD vAlign="top" width="45%">When this flag is set, then escape sequences are 
-                  permitted in bracket expressions (character sets).</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_NEWLINE_ALT&nbsp;</TD>
-               <TD vAlign="top" width="45%">When this flag is set then the newline character is 
-                  equivalent to the alternation operator |.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_PERL&nbsp;</TD>
-               <TD vAlign="top" width="45%">Compiles Perl like regular expressions.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_AWK</TD>
-               <TD vAlign="top" width="45%">A shortcut for awk-like behavior: REG_EXTENDED | 
-                  REG_ESCAPE_IN_LISTS</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_GREP</TD>
-               <TD vAlign="top" width="45%">A shortcut for grep like behavior: REG_BASIC | 
-                  REG_NEWLINE_ALT</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">REG_EGREP</TD>
-               <TD vAlign="top" width="45%">&nbsp;A shortcut for egrep like behavior: 
-                  REG_EXTENDED | REG_NEWLINE_ALT</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>regerror</H3>
-      <P>regerror takes the following parameters, it maps an error code to a human 
-         readable string:
-         <BR>
-      </P>
-      <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="50%">int code</TD>
-               <TD vAlign="top" width="50%">The error code.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">const regex_t* e</TD>
-               <TD vAlign="top" width="50%">The regular expression (can be null).</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">char* buf</TD>
-               <TD vAlign="top" width="50%">The buffer to fill in with the error message.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">unsigned int buf_size</TD>
-               <TD vAlign="top" width="50%">The length of buf.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>If the error code is OR'ed with REG_ITOA then the message that results is the 
-         printable name of the code rather than a message, for example "REG_BADPAT". If 
-         the code is REG_ATIO then <B>e</B> must not be null and <B>e-&gt;re_pend</B> must 
-         point to the printable name of an error code, the return value is then the 
-         value of the error code. For any other value of <B>code</B>, the return value 
-         is the number of characters in the error message, if the return value is 
-         greater than or equal to <B>buf_size</B> then <B>regerror</B> will have to be 
-         called again with a larger buffer.</P>
-      <H3>regexec</H3>
-      <P><B>regexec</B> finds the first occurrence of expression <B>e</B> within string <B>buf</B>. 
-         If <B>len</B> is non-zero then *<B>m</B> is filled in with what matched the 
-         regular expression, <B>m[0]</B> contains what matched the whole string, <B>m[1] </B>
-         the first sub-expression etc, see <B>regmatch_t</B> in the header file 
-         declaration for more details. The <B>eflags</B> parameter can be a combination 
-         of:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table4" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="50%">REG_NOTBOL</TD>
-               <TD vAlign="top" width="50%">Parameter <B>buf </B>does not represent the start of 
-                  a line.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">REG_NOTEOL</TD>
-               <TD vAlign="top" width="50%">Parameter <B>buf</B> does not terminate at the end of 
-                  a line.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">REG_STARTEND</TD>
-               <TD vAlign="top" width="50%">The string searched starts at buf + pmatch[0].rm_so 
-                  and ends at buf + pmatch[0].rm_eo.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>regfree</H3>
-      <P>Finally <B>regfree</B> frees all the memory that was allocated by regcomp.
-      </P>
-      <P><I>Footnote: this is an abridged reference to the POSIX API functions, it is 
-            provided for compatibility with other libraries, rather than an API to be used 
-            in new code (unless you need access from a language other than C++). This 
-            version of these functions should also happily coexist with other versions, as 
-            the names used are macros that expand to the actual function names.</I>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/posix_api.qbk b/doc/posix_api.qbk
new file mode 100644
index 00000000..beffa464
--- /dev/null
+++ b/doc/posix_api.qbk
@@ -0,0 +1,142 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+[section:posix POSIX Compatible C API's]
+
+[note this is an abridged reference to the POSIX API functions, these are provided 
+for compatibility with other libraries, rather than as an API to be used 
+in new code (unless you need access from a language other than C++). 
+This version of these functions should also happily coexist with other versions, 
+as the names used are macros that expand to the actual function names.] 
+
+   #include <boost/cregex.hpp>
+   
+or:
+
+   #include <boost/regex.h>
+
+The following functions are available for users who need a POSIX compatible 
+C library, they are available in both Unicode and narrow character versions, 
+the standard POSIX API names are macros that expand to one version or the 
+other depending upon whether UNICODE is defined or not.
+
+[important Note that all the symbols defined here are enclosed inside namespace 
+`boost` when used in C++ programs, unless you use `#include <boost/regex.h>` 
+instead - in which case the symbols are still defined in namespace boost, but 
+are made available in the global namespace as well.]
+
+The functions are defined as:
+
+   extern "C" {
+   
+   struct regex_tA;
+   struct regex_tW;
+   
+   int regcompA(regex_tA*, const char*, int);
+   unsigned int regerrorA(int, const regex_tA*, char*, unsigned int);
+   int regexecA(const regex_tA*, const char*, unsigned int, regmatch_t*, int);
+   void regfreeA(regex_tA*);
+
+   int regcompW(regex_tW*, const wchar_t*, int);
+   unsigned int regerrorW(int, const regex_tW*, wchar_t*, unsigned int);
+   int regexecW(const regex_tW*, const wchar_t*, unsigned int, regmatch_t*, int);
+   void regfreeW(regex_tW*);
+
+   #ifdef UNICODE
+   #define regcomp regcompW
+   #define regerror regerrorW
+   #define regexec regexecW
+   #define regfree regfreeW
+   #define regex_t regex_tW
+   #else
+   #define regcomp regcompA
+   #define regerror regerrorA
+   #define regexec regexecA
+   #define regfree regfreeA
+   #define regex_t regex_tA
+   #endif
+   }
+
+All the functions operate on structure regex_t, which exposes two public members:
+
+[table
+[[Member][Meaning]]
+[[`unsigned int re_nsub`][This is filled in by `regcomp` and indicates the number of sub-expressions contained in the regular expression.]]
+[[`const TCHAR* re_endp`][Points to the end of the expression to compile when the flag REG_PEND is set.]]
+]
+
+[note `regex_t` is actually a `#define` - it is either `regex_tA` or `regex_tW` 
+depending upon whether `UNICODE` is defined or not, `TCHAR` is either `char` 
+or `wchar_t` again depending upon the macro `UNICODE`.]
+
+[#regcomp][h4 regcomp]
+
+`regcomp` takes a pointer to a `regex_t`, a pointer to the expression to 
+compile and a flags parameter which can be a combination of:
+ 
+[table
+[[Flag][Meaning]]
+[[REG_EXTENDED][Compiles modern regular expressions. Equivalent to `regbase::char_classes | regbase::intervals | regbase::bk_refs`. 	 ]]
+[[REG_BASIC][Compiles basic (obsolete) regular expression syntax. Equivalent to `regbase::char_classes | regbase::intervals | regbase::limited_ops | regbase::bk_braces | regbase::bk_parens | regbase::bk_refs`. 	 ]]
+[[REG_NOSPEC][All characters are ordinary, the expression is a literal string. 	 ]]
+[[REG_ICASE][Compiles for matching that ignores character case. 	 ]]
+[[REG_NOSUB][Has no effect in this library. 	 ]]
+[[REG_NEWLINE][When this flag is set a dot does not match the newline character. 	 ]]
+[[REG_PEND][When this flag is set the re_endp parameter of the regex_t structure must point to the end of the regular expression to compile. 	 ]]
+[[REG_NOCOLLATE][When this flag is set then locale dependent collation for character ranges is turned off. 	 ]]
+[[REG_ESCAPE_IN_LISTS][When this flag is set, then escape sequences are permitted in bracket expressions (character sets). 	 ]]
+[[REG_NEWLINE_ALT ][When this flag is set then the newline character is equivalent to the alternation operator |. 	 ]]
+[[REG_PERL][Compiles Perl like regular expressions. 	 ]]
+[[REG_AWK][A shortcut for awk-like behavior: `REG_EXTENDED | REG_ESCAPE_IN_LISTS` 	 ]]
+[[REG_GREP][A shortcut for grep like behavior: `REG_BASIC | REG_NEWLINE_ALT` 	 ]]
+[[REG_EGREP][A shortcut for egrep like behavior: `REG_EXTENDED | REG_NEWLINE_ALT` 	 ]]
+]
+
+[#regerror][h4 regerror]
+
+regerror takes the following parameters, it maps an error code to a human 
+readable string:
+
+[table
+[[Parameter][Meaning]]
+[[int code][The error code. 	 ]]
+[[const regex_t* e][The regular expression (can be null). 	 ]]
+[[char* buf][The buffer to fill in with the error message. 	 ]]
+[[unsigned int buf_size][The length of buf. 	 ]]
+]
+
+If the error code is OR'ed with REG_ITOA then the message that results is the 
+printable name of the code rather than a message, for example "REG_BADPAT". 
+If the code is REG_ATIO then e must not be null and e->re_pend must point 
+to the printable name of an error code, the return value is then the value 
+of the error code. For any other value of code, the return value is the 
+number of characters in the error message, if the return value is greater than 
+or equal to buf_size then regerror will have to be called again with a larger buffer.
+
+[#regexec][h4 regexec]
+
+regexec finds the first occurrence of expression e within string buf. 
+If len is non-zero then /*m/ is filled in with what matched the regular 
+expression, m[0] contains what matched the whole string, m[1] the 
+first sub-expression etc, see regmatch_t in the header file declaration 
+for more details. The eflags parameter can be a combination of:
+ 
+[table
+[[Flag][Meaning]]
+[[REG_NOTBOL][Parameter buf does not represent the start of a line. 	 ]]
+[[REG_NOTEOL][Parameter buf does not terminate at the end of a line. 	 ]]
+[[REG_STARTEND][The string searched starts at buf + pmatch\[0\].rm_so and ends at buf + pmatch\[0\].rm_eo. 	 ]]
+]
+
+[#regfree][h4 regfree]
+
+`regfree` frees all the memory that was allocated by regcomp.
+
+[endsect]
+
+
+
diff --git a/doc/redistributables.html b/doc/redistributables.html
deleted file mode 100644
index cdad4739..00000000
--- a/doc/redistributables.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Redistributables and Library Names</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Redistributables and Library Names</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>If you are using Microsoft or Borland C++ and link to a dll version of the run 
-         time library, then you can choose to also link to a dll version of boost.regex 
-         by defining the symbol BOOST_REGEX_DYN_LINK when you compile your code. While 
-         these dll's are redistributable, there are no "standard" versions, so when 
-         installing on the users PC, you should place these in a directory private to 
-         your application, and not in the PC's directory path. Note that if you link to 
-         a static version of your run time library, then you will also link to a static 
-         version of boost.regex and no dll's will need to be distributed. The possible 
-         boost.regex dll and library names are computed according to the <A href="../../../more/getting_started.html#step5">
-            formula given in the getting started guide</A>.
-      </P>
-      <P>Note: you can disable automatic library selection by defining the symbol 
-         BOOST_REGEX_NO_LIB when compiling, this is useful if you want to build 
-         Boost.Regex yourself in your IDE, or if you need to debug boost.regex.
-      </P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/redistributables.qbk b/doc/redistributables.qbk
new file mode 100644
index 00000000..c310ff67
--- /dev/null
+++ b/doc/redistributables.qbk
@@ -0,0 +1,28 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:redist Redistributables]
+
+If you are using Microsoft or Borland C++ and link to a dll version of the 
+run time library, then you can choose to also link to a dll version of Boost.Regex 
+by defining the symbol BOOST_REGEX_DYN_LINK when you compile your code. 
+While these dll's are redistributable, there are no "standard" versions, 
+so when installing on the users PC, you should place these in a 
+directory private to your application, and not in the PC's directory path. 
+Note that if you link to a static version of your run time library, then 
+you will also link to a static version of Boost.Regex and no dll's will 
+need to be distributed. The possible Boost.Regex dll and library names are 
+computed according to the  formula given in 
+[@../../../../more/getting_started.html the getting started guide].
+
+Note: you can disable automatic library selection by defining the 
+symbol BOOST_REGEX_NO_LIB when compiling, this is useful if you want to 
+build Boost.Regex yourself in your IDE, or if you need to debug Boost.Regex. 
+
+[endsect]
+
diff --git a/doc/reg_expression.html b/doc/reg_expression.html
deleted file mode 100644
index 15962278..00000000
--- a/doc/reg_expression.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Class reg_expression (deprecated)</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Class reg_expression (deprecated)</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The use of class template reg_expression is deprecated: use <A href="basic_regex.html">
-            basic_regex</A> instead.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/regbase.html b/doc/regbase.html
deleted file mode 100644
index e2cf5c54..00000000
--- a/doc/regbase.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>Boost.Regex: regbase</title>
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<p></p>
-
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../boost.png" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">regbase</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<p>Use of the type <code>boost::regbase</code> is now deprecated,
-and the type does not form a part of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-regular expression standardization proposal</a>.&nbsp; This type
-still exists as a base class of <code>boost::basic_regex</code>,
-and you can still refer to <code>
-boost::regbase::constant_name</code> in your code, however for
-maximum portability to other std regex implementations you should
-instead use either:</p>
-
-<pre>
-boost::regex_constants::constant_name
-</pre>
-
-<p>or</p>
-
-<pre>
-boost::regex::constant_name
-</pre>
-
-<p>or</p>
-
-<pre>
-boost::wregex::constant_name
-</pre>
-
-<p></p>
-
-<hr>
-<br>
-<br>
- 
-
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
-</html>
-
-
diff --git a/doc/regex.html b/doc/regex.html
deleted file mode 100644
index 7a5f29de..00000000
--- a/doc/regex.html
+++ /dev/null
@@ -1,481 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: class RegEx (deprecated)</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class RegEx (deprecated)</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>The high level wrapper class RegEx is now deprecated and does not form a part 
-         of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</a>.&nbsp; This type still exists, and 
-         existing code will continue to compile, however the following documentation is 
-         unlikely to be further updated.</p>
-      <pre>
-#include &lt;boost/cregex.hpp&gt;
-</pre>
-      <p>The class RegEx provides a high level simplified interface to the regular 
-         expression library, this class only handles narrow character strings, and 
-         regular expressions always follow the "normal" syntax - that is the same as the 
-         perl / ECMAScript synatx.</p>
-      <pre>
-<b>typedef</b> <b>bool</b> (*GrepCallback)(<b>const</b> RegEx&amp; expression);
-<b>typedef</b> <b>bool</b> (*GrepFileCallback)(<b>const</b> <b>char</b>* file, <b>const</b> RegEx&amp; expression);
-<b>typedef</b> <b>bool</b> (*FindFilesCallback)(<b>const</b> <b>char</b>* file);
-
-<b>class</b>  RegEx
-{
-<b>public</b>:
-   RegEx();
-   RegEx(<b>const</b> RegEx&amp; o);
-   ~RegEx();
-   RegEx(<b>const</b> <b>char</b>* c, <b>bool</b> icase = <b>false</b>);
-   <strong>explicit</strong> RegEx(<b>const</b> std::string&amp; s, <b>bool</b> icase = <b>false</b>);
-   RegEx&amp; <b>operator</b>=(<b>const</b> RegEx&amp; o);
-   RegEx&amp; <b>operator</b>=(<b>const</b> <b>char</b>* p);
-   RegEx&amp; <b>operator</b>=(<b>const</b> std::string&amp; s);
-   <b>unsigned</b> <b>int</b> SetExpression(<b>const</b> <b>char</b>* p, <b>bool</b> icase = <b>false</b>);
-   <b>unsigned</b> <b>int</b> SetExpression(<b>const</b> std::string&amp; s, <b>bool</b> icase = <b>false</b>);
-   std::string Expression()<b>const</b>;
-   <font color="#000080"><i>//
-</i>   <i>// now matching operators:</i> 
-   <i>//</i></font> 
-   <b>bool</b> Match(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);
-   <b>bool</b> Match(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> char* in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b> max_count = ~0); 
-   <font color="#000080"><i>// 
-</i>   <i>// now operators for returning what matched in more detail: 
-</i>   <i>// 
-</i></font>   <b>unsigned</b> <b>int</b> Position(<b>int</b> i = 0)<b>const</b>; 
-   <b>unsigned</b> <b>int</b> Length(<b>int</b> i = 0)<b>const</b>; 
-   <strong>bool</strong> Matched(<strong>int</strong> i = 0)<strong>const</strong>;
-   <b>unsigned</b> <b>int</b> Line()<b>const</b>; 
-   <b>unsigned int</b> Marks() const; 
-   std::string What(<b>int</b> i)<b>const</b>; 
-   std::string <b>operator</b>[](<b>int</b> i)<b>const</b> ; 
-
-   <strong>static const unsigned int</strong> npos;
-};    
-</pre>
-      <p>Member functions for class RegEx are defined as follows:<br>
-         &nbsp;</p>
-      <p></p>
-      <table id="Table2" cellspacing="0" cellpadding="7" width="100%" border="0">
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx();</td>
-            <td valign="top" width="42%">Default constructor, constructs an instance of RegEx 
-               without any valid expression.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx(<b>const</b> RegEx&amp; o);</td>
-            <td valign="top" width="42%">Copy constructor, all the properties of parameter <i>o</i>
-               are copied.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx(<b>const</b> <b>char</b>* c, <b>bool</b> icase 
-               = <b>false</b>);</td>
-            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-               expression to <i>c</i>, if <i>icase</i> is <i>true</i> then matching is 
-               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-               on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx(<b>const</b> std::string&amp; s, <b>bool</b> icase 
-               = <b>false</b>);</td>
-            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-               expression to <i>s</i>, if <i>icase</i> is <i>true</i> then matching is 
-               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-               on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> RegEx&amp; 
-               o);</td>
-            <td valign="top" width="42%">Default assignment operator.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> <b>char</b>* 
-               p);</td>
-            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(p, 
-                  false).</i> Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> std::string&amp; 
-               s);</td>
-            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(s, 
-                  false).</i> Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>constchar</b>* 
-               p, <b>bool</b> icase = <b>false</b>);</td>
-            <td valign="top" width="42%">Sets the current expression to <i>p</i>, if <i>icase</i>
-               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-               to case. Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>const</b> 
-               std::string&amp; s, <b>bool</b> icase = <b>false</b>);</td>
-            <td valign="top" width="42%">Sets the current expression to <i>s</i>, if <i>icase</i>
-               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-               to case. Throws <i>bad_expression</i> on failure.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string Expression()<b>const</b>;</td>
-            <td valign="top" width="42%">Returns a copy of the current regular expression.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> <b>char</b>* p, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Attempts to match the current expression against the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-               the input string.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> std::string&amp; s, 
-               boost::match_flag_type flags = match_default) ;</td>
-            <td valign="top" width="42%">Attempts to match the current expression against the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-               the input string.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> <b>char</b>* p, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Attempts to find a match for the current expression 
-               somewhere in the text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> std::string&amp; s, 
-               boost::match_flag_type flags = match_default) ;</td>
-            <td valign="top" width="42%">Attempts to find a match for the current expression 
-               somewhere in the text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-               <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
-               as: cb(*this);
-               <p>If at any stage the call-back function returns false then the grep operation 
-                  terminates, otherwise continues until no further matches are found. Returns the 
-                  number of matches found.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-               std::string&amp; s, boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
-               as: cb(*this);
-               <p>If at any stage the call-back function returns false then the grep operation 
-                  terminates, otherwise continues until no further matches are found. Returns the 
-                  number of matches found.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-               v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
-               Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-               v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = 
-               match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
-               Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-                  int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type 
-               flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes the starting index of what matched 
-               onto <i>v</i>. Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-                  int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type 
-               flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match pushes the starting index of what matched 
-               onto <i>v</i>. Returns the number of matches found.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  further matches in the current file, or any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of matches found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Finds all matches of the current expression in the 
-               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  further matches in the current file, or any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of matches found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
-               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
-               at least one match of the current expression using the match flags <i>flags</i> 
-               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
-               calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of files found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
-               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
-               boost::match_flag_type flags = match_default);</td>
-            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
-               at least one match of the current expression using the match flags <i>flags</i> 
-               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
-               calls the call-back function cb.&nbsp;
-               <p>If the call-back returns false then the algorithm returns without considering 
-                  any further files.&nbsp;</p>
-               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-                  file names.&nbsp;</p>
-               <p>Returns the total number of files found.</p>
-               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string Merge(<b>const</b> std::string&amp; in, <b>const</b>
-               std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type 
-               flags = match_default);</td>
-            <td valign="top" width="42%">Performs a search and replace operation: searches 
-               through the string <i>in</i> for all occurrences of the current expression, for 
-               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
-               to determine what gets matched, and how the format string should be treated. If <i>
-                  copy</i> is true then all unmatched sections of input are copied unchanged 
-               to output, if the flag <em>format_first_only</em> is set then only the first 
-               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
-                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
-               and <a href="match_flag_type.html">format flags</a>.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string Merge(<b>const</b> char* in, <b>const</b> 
-               char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = 
-               match_default);</td>
-            <td valign="top" width="42%">Performs a search and replace operation: searches 
-               through the string <i>in</i> for all occurrences of the current expression, for 
-               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
-               to determine what gets matched, and how the format string should be treated. If <i>
-                  copy</i> is true then all unmatched sections of input are copied unchanged 
-               to output, if the flag <em>format_first_only</em> is set then only the first 
-               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
-                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
-               and <a href="match_flag_type.html">format flags</a>.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top"><b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, 
-               std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b>
-               max_count = ~0);</td>
-            <td valign="top">Splits the input string and pushes each one onto the vector. If 
-               the expression contains no marked sub-expressions, then one string is outputted 
-               for each section of the input that does not match the expression. If the 
-               expression does contain marked sub-expressions, then outputs one string for 
-               each marked sub-expression each time a match occurs. Outputs no more than <i>max_count</i>
-               strings. Before returning, deletes from the input string <i>s</i> all of the 
-               input that has been processed (all of the string if <i>max_count</i> was not 
-               reached). Returns the number of strings pushed onto the vector.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Position(<b>int</b> i = 0)<b>const</b>;</td>
-            <td valign="top" width="42%">Returns the position of what matched sub-expression <i>i</i>. 
-               If <i>i = 0</i> then returns the position of the whole match. Returns 
-               RegEx::npos if the supplied index is invalid, or if the specified 
-               sub-expression did not participate in the match.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Length(<b>int</b> i = 0)<b>const</b>;</td>
-            <td valign="top" width="42%">Returns the length of what matched sub-expression <i>i</i>. 
-               If <i>i = 0</i> then returns the length of the whole match. Returns RegEx::npos 
-               if the supplied index is invalid, or if the specified sub-expression did not 
-               participate in the match.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td><strong>bool</strong> Matched(<strong>int</strong> i = 0)<strong>const</strong>;</td>
-            <td>Returns true if sub-expression <em>i</em> was matched, false otherwise.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Line()<b>const</b>;</td>
-            <td valign="top" width="42%">Returns the line on which the match occurred, indexes 
-               start from 1 not zero, if no match occurred then returns RegEx::npos.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%"><b>unsigned int</b> Marks() const;</td>
-            <td valign="top" width="42%">Returns the number of marked sub-expressions 
-               contained in the expression. Note that this includes the whole match 
-               (sub-expression zero), so the value returned is always &gt;= 1.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string What(<b>int</b> i)<b>const</b>;</td>
-            <td valign="top" width="42%">Returns a copy of what matched sub-expression <i>i</i>. 
-               If <i>i = 0</i> then returns a copy of the whole match. Returns a null string 
-               if the index is invalid or if the specified sub-expression did not participate 
-               in a match.</td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td valign="top" width="7%">&nbsp;</td>
-            <td valign="top" width="43%">std::string <b>operator</b>[](<b>int</b> i)<b>const</b>
-               ;</td>
-            <td valign="top" width="42%">Returns <i>what(i);</i>
-               <p>Can be used to simplify access to sub-expression matches, and make usage more 
-                  perl-like.</p>
-            </td>
-            <td valign="top" width="7%">&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex.qbk b/doc/regex.qbk
new file mode 100644
index 00000000..855fce22
--- /dev/null
+++ b/doc/regex.qbk
@@ -0,0 +1,103 @@
+
+[article Boost.Regex
+    [quickbook 1.3]
+    [copyright 2007 John Maddock]
+    [purpose Regular Expressions]
+    [license
+        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])
+    ]
+    [authors [Maddock, John]]
+    [category text]
+    [/last-revision $Date$]
+]
+
+[template super[x]'''<superscript>'''[x]'''</superscript>''']
+[template sub[x]'''<subscript>'''[x]'''</subscript>''']
+
+
+[template tr1[] [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf Technical Report on C++ Library Extensions]]
+[template syntax_option_type[] [link boost_regex.ref.syntax_option_type `syntax_option_type`]]
+[template error_type[] [link boost_regex.ref.error_type `error_type`]]
+[template bad_expression[] [link boost_regex.ref.bad_expression `bad_expression`]]
+[template regex_error[] [link boost_regex.ref.bad_expression `regex_error`]]
+[template basic_regex[] [link boost_regex.ref.basic_regex `basic_regex`]]
+[template match_results[] [link boost_regex.ref.match_results `match_results`]]
+[template sub_match[] [link boost_regex.ref.sub_match `sub_match`]]
+[template match_flag_type[] [link boost_regex.ref.match_flag_type `match_flag_type`]]
+[template regex_iterator[] [link boost_regex.ref.regex_iterator `regex_iterator`]]
+[template regex_token_iterator[] [link boost_regex.ref.regex_token_iterator `regex_token_iterator`]]
+[template regex_search[] [link boost_regex.ref.regex_search `regex_search`]]
+[template regex_match[] [link boost_regex.ref.regex_match `regex_match`]]
+[template regex_replace[] [link boost_regex.ref.regex_replace `regex_replace`]]
+[template regex_grep[] [link boost_regex.ref.deprecated_interfaces.regex_grep `regex_grep`]]
+[template regex_split[] [link boost_regex.ref.deprecated_interfaces.regex_split `regex_split`]]
+[template match_results_format[] [link boost_regex.match_results_format `match_results<>::format`]]
+[template perl_format[] [link boost_regex.format.perl_format Perl]]
+[template sed_format[] [link boost_regex.format.sed_format Sed]]
+[template boost_extended_format[] [link boost_regex.format.boost_format_syntax Boost-Extended]]
+
+[/depricated stuff:]
+[template RegEx[] [link boost_regex.ref.deprecated_interfaces.old_regex `RegEx`]]
+[template regcomp[] [link boost_regex.ref.posix.regcomp `regcomp`]]
+[template regexec[] [link boost_regex.ref.posix.regexec `regexec`]]
+[template regerror[] [link boost_regex.ref.posix.regerror `regerror`]]
+[template regfree[] [link boost_regex.ref.posix.regfree `regfree`]]
+
+[include configuration.qbk]
+[include install.qbk]
+[include introduction.qbk]
+[include unicode.qbk]
+[include captures.qbk]
+[include partial_matches.qbk]
+
+[include syntax.qbk]
+
+[include format_syntax.qbk]
+
+[section:ref Reference]
+
+[include basic_regex.qbk]
+[include match_result.qbk]
+[include sub_match.qbk]
+[include regex_match.qbk]
+[include regex_search.qbk]
+[include regex_replace.qbk]
+[include regex_iterator.qbk]
+[include regex_token_iterator.qbk]
+[include bad_expression.qbk]
+[include syntax_option_type.qbk]
+[include match_flag_type.qbk]
+[include error_type.qbk]
+[include regex_traits.qbk]
+
+[include non_std_strings.qbk]
+[include posix_api.qbk]
+[include concepts.qbk]
+
+[section Deprecated Interfaces]
+[include regex_format.qbk]
+[include regex_grep.qbk]
+[include regex_split.qbk]
+[include old_regex.qbk]
+[endsect]
+
+[endsect]
+
+[section Background Information]
+
+[include headers.qbk]
+[include locale.qbk]
+[include thread_safety.qbk]
+[include examples.qbk]
+[include further_info.qbk]
+[include faq.qbk]
+[include performance.qbk]
+[include standards.qbk]
+[include redistributables.qbk]
+[include acknowledgements.qbk]
+[include history.qbk]
+
+[endsect]
+
diff --git a/doc/regex_format.html b/doc/regex_format.html
deleted file mode 100644
index 74f21e9c..00000000
--- a/doc/regex_format.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>Boost.Regex: Algorithm regex_format (deprecated)</title>
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<p></p>
-
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../boost.png" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">Algorithm regex_format (deprecated)</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<p>The algorithm regex_format is deprecated; new code should use
-match_results::format instead.&nbsp; Existing code will continue to
-compile, the following documentation is taken from the previous
-version of boost.regex and will not be further updated:</p>
-
-<h3>Algorithm regex_format</h3>
-
-<pre>
-#include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
-</pre>
-
-<p>The algorithm regex_format takes the results of a match and
-creates a new string based upon a <a href="format_syntax.html">
-format string</a>, regex_format can be used for search and replace
-operations:</p>
-
-<pre>
-<b>template</b> &lt;<b>class</b> OutputIterator, <b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-OutputIterator regex_format(OutputIterator out,
-                            <b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m,
-                            <b>const</b> charT* fmt,
-                            match_flag_type flags = 0);
-<b>template</b> &lt;<b>class</b> OutputIterator, <b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-OutputIterator regex_format(OutputIterator out,
-                            <b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m,
-                            <b>const</b> std::basic_string&lt;charT&gt;&amp; fmt,
-                            match_flag_type flags = 0);
-</pre>
-
-<p>The library also defines the following convenience variation of
-regex_format, which returns the result directly as a string, rather
-than outputting to an iterator [note - this version may not be
-available, or may be available in a more limited form, depending
-upon your compilers capabilities]:</p>
-
-<pre>
-<b>template</b> &lt;<b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-std::basic_string&lt;charT&gt; regex_format
-                                 (<b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m, 
-                                  <b>const</b> charT* fmt,
-                                  match_flag_type flags = 0);
-
-<b>template</b> &lt;<b>class</b> iterator, <b>class</b> Allocator, <b>class</b> charT&gt;
-std::basic_string&lt;charT&gt; regex_format
-                                 (<b>const</b> match_results&lt;iterator, Allocator&gt;&amp; m, 
-                                  <b>const</b> std::basic_string&lt;charT&gt;&amp; fmt,
-                                  match_flag_type flags = 0);
-</pre>
-
-<p>Parameters to the main version of the function are passed as
-follows:</p>
-
-<p></p>
-
-<table id="Table2" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">OutputIterator out</td>
-<td valign="top" width="44%">An output iterator type, the output
-string is sent to this iterator. Typically this would be a
-std::ostream_iterator.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%"><b>const</b>
-match_results&lt;iterator, Allocator&gt;&amp; m</td>
-<td valign="top" width="44%">An instance of match_results&lt;&gt;
-obtained from one of the matching algorithms above, and denoting
-what matched.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%"><b>const</b> charT* fmt</td>
-<td valign="top" width="44%">A format string that determines how
-the match is transformed into the new string.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%"><b>unsigned</b> flags</td>
-<td valign="top" width="44%">Optional flags which describe how the
-format string is to be interpreted.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p><a name="format_flags"></a>Format flags are defined as
-follows:</p>
-
-<p></p>
-
-<table id="Table3" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_all</td>
-<td valign="top" width="43%">Enables all syntax options (perl-like
-plus extentions).</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_sed</td>
-<td valign="top" width="43%">Allows only a sed-like syntax.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_perl</td>
-<td valign="top" width="43%">Allows only a perl-like syntax.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="9%">&nbsp;</td>
-<td valign="top" width="39%">format_no_copy</td>
-<td valign="top" width="43%">Disables copying of unmatched sections
-to the output string during <a href="regex_merge.html">
-regex_merge</a> operations.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td>&nbsp;</td>
-<td>format_first_only</td>
-<td>When this flag is set only the first occurance will be replaced
-(applies to regex_merge only).</td>
-<td>&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>The format string syntax (and available options) is described
-more fully under <a href="format_syntax.html">format strings</a>
-.</p>
-
-<p></p>
-
-<hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
-</html>
-
-
diff --git a/doc/regex_format.qbk b/doc/regex_format.qbk
new file mode 100644
index 00000000..e59549e1
--- /dev/null
+++ b/doc/regex_format.qbk
@@ -0,0 +1,70 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_format regex_format (Deprecated)]
+
+The algorithm `regex_format` is deprecated; new code should use 
+[match_results_format] instead.  Existing code will continue to compile, 
+the following documentation is taken from the previous version of Boost.Regex and 
+will not be further updated:
+
+[h4 Algorithm regex_format]
+
+   #include <boost/regex.hpp>
+
+The algorithm `regex_format` takes the results of a match and creates a 
+new string based upon a format string, `regex_format` can be used for 
+search and replace operations:
+
+   template <class OutputIterator, class iterator, class Allocator, class charT>
+   OutputIterator regex_format(OutputIterator out,
+                              const match_results<iterator, Allocator>& m,
+                              const charT* fmt,
+                              match_flag_type flags = 0);
+   template <class OutputIterator, class iterator, class Allocator, class charT>
+   OutputIterator regex_format(OutputIterator out,
+                              const match_results<iterator, Allocator>& m,
+                              const std::basic_string<charT>& fmt,
+                              match_flag_type flags = 0);
+
+The library also defines the following convenience variation of 
+`regex_format`, which returns the result directly as a string, rather 
+than outputting to an iterator.
+
+[note This version may not be available, or may be available in a more limited 
+form, depending upon your compilers capabilities]
+
+   template <class iterator, class Allocator, class charT>
+   std::basic_string<charT> regex_format
+                                    (const match_results<iterator, Allocator>& m, 
+                                    const charT* fmt,
+                                    match_flag_type flags = 0);
+
+   template <class iterator, class Allocator, class charT>
+   std::basic_string<charT> regex_format
+                                    (const match_results<iterator, Allocator>& m, 
+                                    const std::basic_string<charT>& fmt,
+                                    match_flag_type flags = 0);
+
+Parameters to the main version of the function are passed as follows:
+
+[table
+[[Parameter][Description]]
+[[`OutputIterator out`][An output iterator type, the output string is sent to this iterator. Typically this would be a std::ostream_iterator. 	 ]]
+[[`const match_results<iterator, Allocator>& m`][An instance of [match_results] obtained from one of the matching algorithms above, and denoting what matched. 	 ]]
+[[`const charT* fmt`][A format string that determines how the match is transformed into the new string. 	 ]]
+[[`unsigned flags`][Optional flags which describe how the format string is to be interpreted. 	 ]]
+]
+
+Format flags are described under [match_flag_type].
+
+The format string syntax (and available options) is described more fully 
+under [link boost_regex.format format strings].
+
+[endsect]
+
diff --git a/doc/regex_grep.html b/doc/regex_grep.html
deleted file mode 100644
index ac1d804b..00000000
--- a/doc/regex_grep.html
+++ /dev/null
@@ -1,377 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_grep (deprecated)</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">Algorithm regex_grep (deprecated)</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <p>The algorithm regex_grep is deprecated in favor of <a href="regex_iterator.html">regex_iterator</a>
-         which provides a more convenient and standard library friendly interface.</p>
-      <p>The following documentation is taken unchanged from the previous boost release, 
-         and will not be updated in future.</p>
-      <hr>
-      <pre>
-#include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
-</pre>
-      <p>regex_grep allows you to search through a bidirectional-iterator range and 
-         locate all the (non-overlapping) matches with a given regular expression. The 
-         function is declared as:</p>
-      <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> iterator, <b>class</b> charT, <b>class</b> traits&gt;
-<b>unsigned</b> <b>int</b> regex_grep(Predicate foo,
-                         iterator first,
-                         iterator last,
-                         <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e,
-                         boost::match_flag_type flags = match_default)
-</pre>
-      <p>The library also defines the following convenience versions, which take either 
-         a const charT*, or a const std::basic_string&lt;&gt;&amp; in place of a pair of 
-         iterators [note - these versions may not be available, or may be available in a 
-         more limited form, depending upon your compilers capabilities]:</p>
-      <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> charT, <b>class</b> traits&gt;
-<b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
-              <b>const</b> charT* str, 
-              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
-              boost::match_flag_type flags = match_default);
-
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> charT, <b>class</b> traits&gt;
-<b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
-              <b>const</b> std::basic_string&lt;charT, ST, SA&gt;&amp; s, 
-              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
-              boost::match_flag_type flags = match_default);
-</pre>
-      <p>The parameters for the primary version of regex_grep have the following 
-         meanings:&nbsp;</p>
-      <p></p>
-      <table id="Table2" cellspacing="0" cellpadding="7" width="624" border="0">
-         <tr>
-            <td width="5%">&nbsp;</td>
-            <td valign="top" width="50%">foo</td>
-            <td valign="top" width="50%">A predicate function object or function pointer, see 
-               below for more information.</td>
-            <td width="5%">&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">first</td>
-            <td valign="top" width="50%">The start of the range to search.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">last</td>
-            <td valign="top" width="50%">The end of the range to search.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">e</td>
-            <td valign="top" width="50%">The regular expression to search for.</td>
-            <td>&nbsp;</td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td valign="top" width="50%">flags</td>
-            <td valign="top" width="50%">The flags that determine how matching is carried out, 
-               one of the <a href="match_flag_type.html">match_flags</a> enumerators.</td>
-            <td>&nbsp;</td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <p>The algorithm finds all of the non-overlapping matches of the expression e, for 
-         each match it fills a <a href="match_results.html">match_results</a>&lt;iterator&gt; 
-         structure, which contains information on what matched, and calls the predicate 
-         foo, passing the match_results&lt;iterator&gt; as a single argument. If the 
-         predicate returns true, then the grep operation continues, otherwise it 
-         terminates without searching for further matches. The function returns the 
-         number of matches found.</p>
-      <p>The general form of the predicate is:</p>
-      <pre>
-<b>struct</b> grep_predicate
-{
- <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type&gt;&amp; m);
-};
-</pre>
-      <p>For example the regular expression "a*b" would find one match in the string 
-         "aaaaab" and two in the string "aaabb".</p>
-      <p>Remember this algorithm can be used for a lot more than implementing a version 
-         of grep, the predicate can be and do anything that you want, grep utilities 
-         would output the results to the screen, another program could index a file 
-         based on a regular expression and store a set of bookmarks in a list, or a text 
-         file conversion utility would output to file. The results of one regex_grep can 
-         even be chained into another regex_grep to create recursive parsers.</p>
-      <P>The algorithm may throw&nbsp;<CODE>std::runtime_error</CODE> if the complexity 
-         of matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <p><a href="../example/snippets/regex_grep_example_1.cpp"> Example</a>: convert 
-         the example from <i>regex_search</i> to use <i>regex_grep</i> instead:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-
-</font><font color="#000080"><i>// 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 
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-
-const char* re = 
-   // possibly leading whitespace:   
-   "^[[:space:]]*" 
-   // possible template declaration:
-   "(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"
-   // class or struct:
-   "(class|struct)[[:space:]]*" 
-   // leading declspec macros etc:
-   "("
-      "\\&lt;\\w+\\&gt;"
-      "("
-         "[[:blank:]]*\\([^)]*\\)"
-      ")?"
-      "[[:space:]]*"
-   ")*" 
-   // the class name
-   "(\\&lt;\\w*\\&gt;)[[:space:]]*" 
-   // template specialisation parameters
-   "(&lt;[^;:{]+&gt;)?[[:space:]]*"
-   // terminate in { or :
-   "(\\{|:[^;\\{()]*\\{)";
-
-boost::regex expression(re); 
-<b>class</b> IndexClassesPred 
-{ 
-   map_type&amp; m; 
-   std::string::const_iterator base; 
-<b>public</b>: 
-   IndexClassesPred(map_type&amp; a, std::string::const_iterator b) : m(a), base(b) {} 
-   <b>bool</b> <b>operator</b>()(<b>const</b>  smatch&amp; what) 
-   { 
- <font color=
-#000080>     <i>// what[0] contains the whole string 
-</i>      <i>// what[5] contains the class name. 
-</i>      <i>// what[6] contains the template specialisation if any. 
-</i>      <i>// add class name and position to map: 
-</i></font>      m[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-                what[5].first - base; 
-      <b>return</b> <b>true</b>; 
-   } 
-}; 
-<b>void</b> IndexClasses(map_type&amp; m, <b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   regex_grep(IndexClassesPred(m, start), start, end, expression); 
-}
-</pre>
-      <p><a href="../example/snippets/regex_grep_example_2.cpp"> Example</a>: Use 
-         regex_grep to call a global callback function:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-
-</font><font color="#000080"><i>// 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 
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-
-const char* re = 
-   // possibly leading whitespace:   
-   "^[[:space:]]*" 
-   // possible template declaration:
-   "(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"
-   // class or struct:
-   "(class|struct)[[:space:]]*" 
-   // leading declspec macros etc:
-   "("
-      "\\&lt;\\w+\\&gt;"
-      "("
-         "[[:blank:]]*\\([^)]*\\)"
-      ")?"
-      "[[:space:]]*"
-   ")*" 
-   // the class name
-   "(\\&lt;\\w*\\&gt;)[[:space:]]*" 
-   // template specialisation parameters
-   "(&lt;[^;:{]+&gt;)?[[:space:]]*"
-   // terminate in { or :
-   "(\\{|:[^;\\{()]*\\{)";
-
-boost::regex expression(re);
-map_type class_index; 
-std::string::const_iterator base; 
-
-<b>bool</b> grep_callback(<b>const</b>  boost::smatch&amp; what) 
-{ 
- <font color="#000080">  <i>// what[0] contains the whole string 
-</i>   <i>// what[5] contains the class name. 
-</i>   <i>// what[6] contains the template specialisation if any. 
-</i>   <i>// add class name and position to map: 
-</i></font>   class_index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-                what[5].first - base; 
-   <b>return</b> <b>true</b>; 
-} 
-<b>void</b> IndexClasses(<b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   base = start; 
-   regex_grep(grep_callback, start, end, expression, match_default); 
-}
- 
-</pre>
-      <p><a href="../example/snippets/regex_grep_example_3.cpp"> Example</a>: use 
-         regex_grep to call a class member function, use the standard library adapters <i>std::mem_fun</i>
-         and <i>std::bind1st</i> to convert the member function into a predicate:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-#include &lt;functional&gt; 
-</font><font color="#000080"><i>// 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 
-
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-<b>class</b> class_index 
-{ 
-   boost::regex expression; 
-   map_type index; 
-   std::string::const_iterator base; 
-   <b>bool</b>  grep_callback(boost::smatch what); 
-<b>public</b>: 
- <b>  void</b> IndexClasses(<b>const</b> std::string&amp; file); 
-   class_index() 
-      : index(), 
-        expression(<font color=
-#000080>"^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?" 
-                   "[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(\\{|:[^;\\{()]*\\{)" 
-</font>                   ){} 
-}; 
-<b>bool</b>  class_index::grep_callback(boost::smatch what) 
-{ 
- <font color="#000080">  <i>// what[0] contains the whole string 
-</i>   <i>// what[5] contains the class name. 
-</i>   <i>// what[6] contains the template specialisation if any. 
-</i>   <i>// add class name and position to map: 
-</i></font>   index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-               what[5].first - base; 
-   <b>return</b> <b>true</b>; 
-} 
-
-<b>void</b> class_index::IndexClasses(<b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   base = start; 
-   regex_grep(std::bind1st(std::mem_fun(&amp;class_index::grep_callback), <b>this</b>), 
-              start, 
-              end, 
-              expression); 
-} 
- 
-</pre>
-      <p><a href="../example/snippets/regex_grep_example_4.cpp"> Finally</a>, C++ 
-         Builder users can use C++ Builder's closure type as a callback argument:</p>
-      <pre>
-<font color="#008000">#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-#include &lt;functional&gt; 
-</font><font color="#000080"><i>// 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 
-
-</i></font><b>typedef</b> std::map&lt;std::string, <b>int</b>, std::less&lt;std::string&gt; &gt; map_type; 
-<b>class</b> class_index 
-{ 
-   boost::regex expression; 
-   map_type index; 
-   std::string::const_iterator base; 
-   <b>typedef</b>  boost::smatch arg_type; 
-   <b>bool</b> grep_callback(<b>const</b> arg_type&amp; what); 
-<b>public</b>: 
-   <b>typedef</b> <b>bool</b> (<b>__closure</b>* grep_callback_type)(<b>const</b> arg_type&amp;); 
-   <b>void</b> IndexClasses(<b>const</b> std::string&amp; file); 
-   class_index() 
-      : index(), 
-        expression(<font color=
-#000080>"^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?" 
-                   "[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?" 
-                   "(\\{|:[^;\\{()]*\\{)" 
-</font>                   ){} 
-}; 
-
-<b>bool</b> class_index::grep_callback(<b>const</b> arg_type&amp; what) 
-{ 
- <font color=
-#000080>  <i>// what[0] contains the whole string</i>    
-<i>// what[5] contains the class name.</i>    
-<i>// what[6] contains the template specialisation if any.</i>    
-<i>// add class name and position to map:</i></font>    
-index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
-               what[5].first - base; 
-   <b>return</b> <b>true</b>; 
-} 
-
-<b>void</b> class_index::IndexClasses(<b>const</b> std::string&amp; file) 
-{ 
-   std::string::const_iterator start, end; 
-   start = file.begin(); 
-   end = file.end(); 
-   base = start; 
-   class_index::grep_callback_type cl = &amp;(<b>this</b>-&gt;grep_callback); 
-   regex_grep(cl, 
-            start, 
-            end, 
-            expression); 
-}
-</pre>
-      <p></p>
-      <hr>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex_grep.qbk b/doc/regex_grep.qbk
new file mode 100644
index 00000000..7d47a401
--- /dev/null
+++ b/doc/regex_grep.qbk
@@ -0,0 +1,320 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_grep regex_grep (Deprecated)]
+
+The algorithm `regex_grep` is deprecated in favor of [regex_iterator]
+which provides a more convenient and standard library friendly interface.
+
+The following documentation is taken unchanged from the previous boost 
+release, and will not be updated in future.
+
+   #include <boost/regex.hpp>
+
+`regex_grep` allows you to search through a bidirectional-iterator range and 
+locate all the (non-overlapping) matches with a given regular expression. 
+The function is declared as:
+
+   template <class Predicate, class iterator, class charT, class traits>
+   unsigned int regex_grep(Predicate foo,
+                           iterator first,
+                           iterator last,
+                           const basic_regex<charT, traits>& e,
+                           boost::match_flag_type flags = match_default)
+
+The library also defines the following convenience versions, which take 
+either a `const charT*`, or a `const std::basic_string<>&` in place of a 
+pair of iterators.
+
+   template <class Predicate, class charT, class traits>
+   unsigned int regex_grep(Predicate foo, 
+               const charT* str, 
+               const basic_regex<charT, traits>& e, 
+               boost::match_flag_type flags = match_default);
+
+   template <class Predicate, class ST, class SA, class charT, class traits>
+   unsigned int regex_grep(Predicate foo, 
+               const std::basic_string<charT, ST, SA>& s, 
+               const basic_regex<charT, traits>& e, 
+               boost::match_flag_type flags = match_default);
+
+The parameters for the primary version of `regex_grep` have the following meanings: 
+
+foo: 	A predicate function object or function pointer, see below for more information.
+ 	 
+first: 	The start of the range to search. 	 
+
+last: 	The end of the range to search. 	 
+
+e: 	The regular expression to search for. 	 
+
+flags: 	The flags that determine how matching is carried out, one of the match_flags enumerators. 	 
+
+
+The algorithm finds all of the non-overlapping matches of the expression /e/, 
+for each match it fills a `match_results<iterator>` structure, which 
+contains information on what matched, and calls the predicate /foo/, passing the 
+`match_results<iterator>` as a single argument. If the predicate returns 
+/true/, then the grep operation continues, otherwise it terminates 
+without searching for further matches. The function returns the number 
+of matches found.
+
+The general form of the predicate is:
+
+   struct grep_predicate
+   {
+      bool operator()(const match_results<iterator_type>& m);
+   };
+
+For example the regular expression "a\*b" would find one match in the string 
+"aaaaab" and two in the string "aaabb".
+
+Remember this algorithm can be used for a lot more than implementing a 
+version of grep, the predicate can be and do anything that you want, 
+grep utilities would output the results to the screen, another program could 
+index a file based on a regular expression and store a set of bookmarks in a list, 
+or a text file conversion utility would output to file. The results of one 
+`regex_grep` can even be chained into another `regex_grep` to create recursive parsers.
+
+The algorithm may throw `std::runtime_error` if the complexity of matching the 
+expression against an /N/ character string begins to exceed O(N[super 2]), or 
+if the program runs out of stack space while matching the expression 
+(if Boost.Regex is configured in recursive mode), or if the matcher 
+exhausts it's permitted memory allocation (if Boost.Regex is configured in 
+non-recursive mode).
+
+Example: convert the example from [regex_search] to use `regex_grep` instead:
+
+   #include <string> 
+   #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; 
+
+   const char* re = 
+      // 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 :
+      "(\\{|:[^;\\{()]*\\{)";
+
+   boost::regex expression(re); 
+   class IndexClassesPred 
+   { 
+      map_type& m; 
+      std::string::const_iterator base; 
+   public: 
+      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[5].first - base; 
+         return true; 
+      } 
+   }; 
+   void IndexClasses(map_type& m, const std::string& file) 
+   { 
+      std::string::const_iterator start, end; 
+      start = file.begin(); 
+      end = file.end(); 
+      regex_grep(IndexClassesPred(m, start), start, end, expression); 
+   }
+
+Example: Use `regex_grep` to call a global callback function:
+
+   #include <string> 
+   #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; 
+
+   const char* re = 
+      // 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 :
+      "(\\{|:[^;\\{()]*\\{)";
+
+   boost::regex expression(re);
+   map_type class_index; 
+   std::string::const_iterator base; 
+
+   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[5].first - base; 
+      return true; 
+   } 
+   void IndexClasses(const std::string& file) 
+   { 
+      std::string::const_iterator start, end; 
+      start = file.begin(); 
+      end = file.end(); 
+      base = start; 
+      regex_grep(grep_callback, start, end, expression, match_default); 
+   }
+ 
+
+Example: use `regex_grep` to call a class member function, use the standard 
+library adapters `std::mem_fun` and `std::bind1st` to convert the member 
+function into a predicate:
+
+   #include <string> 
+   #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 
+
+   typedef std::map<std::string, int, std::less<std::string> > map_type; 
+   class class_index 
+   { 
+      boost::regex expression; 
+      map_type index; 
+      std::string::const_iterator base; 
+      bool  grep_callback(boost::smatch what); 
+   public: 
+      void IndexClasses(const std::string& file); 
+      class_index() 
+         : index(), 
+         expression("^(template[[:space:]]*<[^;:{]+>[[:space:]]*)?" 
+                     "(class|struct)[[:space:]]*(\\<\\w+\\>([[:blank:]]*\\([^)]*\\))?" 
+                     "[[:space:]]*)*(\\<\\w*\\>)[[:space:]]*(<[^;:{]+>[[:space:]]*)?" 
+                     "(\\{|:[^;\\{()]*\\{)" 
+                     ){} 
+   }; 
+   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[5].first - base; 
+      return true; 
+   } 
+
+   void class_index::IndexClasses(const std::string& file) 
+   { 
+      std::string::const_iterator start, end; 
+      start = file.begin(); 
+      end = file.end(); 
+      base = start; 
+      regex_grep(std::bind1st(std::mem_fun(&class_index::grep_callback), this), 
+               start, 
+               end, 
+               expression); 
+   } 
+ 
+
+Finally, C++ Builder users can use C++ Builder's closure type as a callback argument:
+
+   #include <string> 
+   #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 
+
+   typedef std::map<std::string, int, std::less<std::string> > map_type; 
+   class class_index 
+   { 
+      boost::regex expression; 
+      map_type index; 
+      std::string::const_iterator base; 
+      typedef  boost::smatch arg_type; 
+      bool grep_callback(const arg_type& what); 
+   public: 
+      typedef bool (__closure* grep_callback_type)(const arg_type&); 
+      void IndexClasses(const std::string& file); 
+      class_index() 
+         : index(), 
+         expression("^(template[[:space:]]*<[^;:{]+>[[:space:]]*)?" 
+                     "(class|struct)[[:space:]]*(\\<\\w+\\>([[:blank:]]*\\([^)]*\\))?" 
+                     "[[:space:]]*)*(\\<\\w*\\>)[[:space:]]*(<[^;:{]+>[[:space:]]*)?" 
+                     "(\\{|:[^;\\{()]*\\{)" 
+                     ){} 
+   }; 
+
+   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[5].first - base; 
+      return true; 
+   } 
+
+   void class_index::IndexClasses(const std::string& file) 
+   { 
+      std::string::const_iterator start, end; 
+      start = file.begin(); 
+      end = file.end(); 
+      base = start; 
+      class_index::grep_callback_type cl = &(this->grep_callback); 
+      regex_grep(cl, 
+               start, 
+               end, 
+               expression); 
+   }
+
+
+[endsect]
+
diff --git a/doc/regex_iterator.html b/doc/regex_iterator.html
deleted file mode 100644
index f2e647f5..00000000
--- a/doc/regex_iterator.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: regex_iterator</title>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link href="../../../boost.css" type="text/css" rel="stylesheet">
-   </head>
-   <body>
-      <p></p>
-      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
-         <tr>
-            <td valign="top" width="300">
-               <h3><a href="../../../index.htm"><img height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></a></h3>
-            </td>
-            <td width="353">
-               <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">regex_iterator</h2>
-            </td>
-            <td width="50">
-               <h3><a href="index.html"><img height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></a></h3>
-            </td>
-         </tr>
-      </table>
-      <br>
-      <br>
-      <hr>
-      <h3>Contents</h3>
-      <dl class="index">
-         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a> <dt><a href="#examples">
-                     Examples</a></dt>
-      </dl>
-      <h3><a name="synopsis"></a>Synopsis</h3>
-      <p>The iterator type regex_iterator will enumerate all of the regular expression 
-         matches found in some sequence: dereferencing a regex_iterator yields a 
-         reference to a&nbsp;<a href="match_results.html">match_results</a> object.</p>
-      <pre>
-template &lt;class BidirectionalIterator, 
-          class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt; &gt;
-class regex_iterator 
-{
-public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
-   typedef          <A href="match_results.html">match_results</A>&lt;BidirectionalIterator&gt;                    value_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
-   typedef          const value_type*                                       pointer;
-   typedef          const value_type&amp;                                       reference;
-   typedef          std::forward_iterator_tag                               iterator_category;
-   
-   <A href="#c1">regex_iterator</A>();
-   <A href="#c2">regex_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, 
-                  const regex_type&amp; re, 
-                  <A href="match_flag_type.html">match_flag_type</A> m = match_default);
-   <A href="#c3">regex_iterator</A>(const regex_iterator&amp;);
-   regex_iterator&amp; <A href="#o1">operator</A>=(const regex_iterator&amp;);
-   bool <A href="#o2">operator</A>==(const regex_iterator&amp;)const;
-   bool <A href="#o3">operator</A>!=(const regex_iterator&amp;)const;
-   const value_type&amp; <A href="#o4">operator</A>*()const;
-   const value_type* <A href="#o5">operator</A>-&gt;()const;
-   regex_iterator&amp; <A href="#o6">operator</A>++();
-   regex_iterator <A href="#o7">operator</A>++(int);
-};
-
-typedef
-regex_iterator&lt;const
-
-char*&gt; cregex_iterator; typedef                  regex_iterator&lt;std::string::const_iterator&gt;
-sregex_iterator; #ifndef  BOOST_NO_WREGEX
-typedef regex_iterator&lt;const
-wchar_t*&gt; wcregex_iterator; typedef               regex_iterator&lt;std::wstring::const_iterator&gt;
-wsregex_iterator; #endif template
-&lt;class
-
-charT, class traits&gt; regex_iterator&lt;const charT*,
-charT, traits&gt; 
-   <A href="#make_regex_iterator">make_regex_iterator</A>(const charT* p, const basic_regex&lt;charT, traits&gt;&amp; e, regex_constants::match_flag_type m =       regex_constants::match_default); template  &lt;class
-   
-charT, class traits, class ST, class SA&gt; regex_iterator&lt;typename std::basic_string&lt;charT,
-ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_iterator">make_regex_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, const basic_regex&lt;charT, traits&gt;&amp; e, regex_constants::match_flag_type m = regex_constants::match_default);
-
-</pre>
-      <h3><a name="description"></a>Description</h3>
-      <p>A regex_iterator is constructed from a pair of iterators, and enumerates all 
-         occurrences of a regular expression within that iterator range.</p>
-      <pre><A name=c1></A>
-regex_iterator();
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs an end of sequence regex_iterator.</p>
-      <pre><A name=c2></A>regex_iterator(BidirectionalIterator a, BidirectionalIterator b, 
-               const regex_type&amp; re, 
-               <A href="match_flag_type.html">match_flag_type</A> m = match_default);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs a regex_iterator that will enumerate all occurrences 
-         of the expression <em>re</em>, within the sequence <em>[a,b)</em>, and found 
-         using match flags <em>m</em>.&nbsp; The object <em>re</em> must exist for the 
-         lifetime of the regex_iterator.</p>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <pre><A name=c3></A>
-regex_iterator(const regex_iterator&amp; that);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs a copy of <code>that</code>.</p>
-      <b></b>
-      <p><b>Postconditions:</b> <code>*this == that</code>.</p>
-      <pre><A name=o1></A>
-regex_iterator&amp; operator=(const regex_iterator&amp;);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> sets&nbsp;<code>*this</code> equal to those in <code>that</code>.</p>
-      <b></b>
-      <p><b>Postconditions:</b> <code>*this == that</code>.</p>
-      <pre><A name=o2></A>
-bool operator==(const regex_iterator&amp; that)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> returns true if *this is equal to that.</p>
-      <pre><A name=o3></A>
-bool operator!=(const regex_iterator&amp;)const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> returns <code>!(*this == that)</code>.</p>
-      <pre><A name=o4></A>
-const value_type&amp; operator*()const;
-</pre>
-      <p><b>Effects:</b> dereferencing a regex_iterator object <em>it</em> yields a 
-         const reference to a <a href="match_results.html">match_results</a> object, 
-         whose members are set as follows:</p>
-      <p></p>
-      <table id="Table2" cellspacing="1" cellpadding="7" width="624" border="1">
-         <tbody>
-            <tr>
-               <td valign="top" width="50%"><b></b>
-                  <p><b>Element</b></p>
-               </td>
-               <td valign="top" width="50%"><b></b>
-                  <p><b>Value</b></p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).size()</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>re.mark_count()</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).empty()</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>false</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).prefix().first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The end of the last match found, or the start of the underlying sequence if 
-                     this is the first match enumerated</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).prefix().last</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The same as the start of the match found:<BR>
-                     (*it)[0].first</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).prefix().matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>True if the prefix did not match an empty string:<BR>
-                     (*it).prefix().first != (*it).prefix().second</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).suffix().first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The same as the end of the match found:<BR>
-                     (*it)[0].second</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).suffix().last</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The end of the underlying sequence.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it).suffix().matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>True if the suffix did not match an empty string:<BR>
-                     (*it).suffix().first != (*it).suffix().second</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[0].first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The start of the sequence of characters that matched the regular expression</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[0].second</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>The end of the sequence of characters that matched the regular expression</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[0].matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p><code>true</code> if a full match was found, and <code>false</code> if it was a 
-                     partial match (found as a result of the <code>match_partial</code> flag being 
-                     set).</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[n].first</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>For all integers n &lt; (*it).size(), the start of the sequence that matched 
-                     sub-expression <i>n</i>. Alternatively, if sub-expression n did not participate 
-                     in the match, then <i>last</i>.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[n].second</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>For all integers n &lt; (*it).size(), the end of the sequence that matched 
-                     sub-expression <i>n</i>. Alternatively, if sub-expression n did not participate 
-                     in the match, then <i>last</i>.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">
-                  <p>(*it)[n].matched</p>
-               </td>
-               <td valign="top" width="50%">
-                  <p>For all integers n &lt; (*it).size(), true if sub-expression <i>n</i> participated 
-                     in the match, false otherwise.</p>
-               </td>
-            </tr>
-            <tr>
-               <td valign="top" width="50%">(*it).position(n)</td>
-               <td valign="top" width="50%">For all integers n &lt; (*it).size(), then the 
-                  distance from the start of the underlying sequence to the start of 
-                  sub-expression match <em>n</em>.</td>
-            </tr>
-         </tbody>
-      </table>
-      <br>
-      <br>
-      <pre><A name=o5></A>
-const value_type* operator-&gt;()const;
-</pre>
-      <b></b>
-      <p><b>Effects:</b> returns <code>&amp;(*this)</code>.</p>
-      <pre><A name=o6></A>
-regex_iterator&amp; operator++();
-</pre>
-      <p><strong>Effects:</strong> moves the iterator to the next match in the 
-         underlying sequence, or the end of sequence iterator if none if found. 
-         &nbsp;When the last match found matched a zero length string, then the 
-         regex_iterator will find the next match as follows: if there exists a non-zero 
-         length match that starts at the same location as the last one, then returns it, 
-         otherwise starts looking for the next (possibly zero length) match from one 
-         position to the right of the last match.</p>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <b></b>
-      <p><b>Returns:</b> <code>*this</code>.</p>
-      <pre><A name=o7></A>
-regex_iterator operator++(int);
-</pre>
-      <b></b>
-      <p><b>Effects:</b> constructs a copy <code>result</code> of <code>*this</code>, 
-         then calls <code>++(*this)</code>.</p>
-      <b></b>
-      <p><b>Returns:</b> <code>result</code>.</p>
-      <PRE><A name=make_regex_iterator></A>template &lt;class charT, class traits&gt; regex_iterator&lt;const charT*, charT, traits&gt;
-make_regex_iterator(const charT* 
-   p, const basic_regex&lt;charT, 
-                       traits&gt;&amp; e, regex_constants::match_flag_type m 
-                       = regex_constants::match_default); template &lt;class
-                       
-charT, class traits, class ST, class SA&gt; regex_iterator&lt;typename std::basic_string&lt;charT,
-ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                       const basic_regex&lt;charT, traits&gt;&amp; e, 
-                       regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P><STRONG>Effects:</STRONG> returns an iterator that enumerates all occurences of 
-         expression <EM>e</EM> in text <EM>p</EM> using match_flags <EM>m</EM>.</P>
-      <h3><a name=examples></a>Examples</h3>
-      <p>The following <a href="../example/snippets/regex_iterator_example.cpp">example</a>
-         takes a C++ source file and builds up an index of class names, and the location 
-         of that class in the file.</p>
-      <pre>
-<font color="#008040">#include &lt;string&gt;</font>
-<font color="#008040">#include &lt;map&gt;</font>
-<font color="#008040">#include &lt;fstream&gt;</font>
-<font color="#008040">#include &lt;iostream&gt;</font>
-<font color="#008040">#include &lt;boost/regex.hpp&gt;</font>
-
-<b>using</b> <b>namespace</b> std;
-
-<i><font color="#000080">// purpose:</font></i>
-<i><font color=
-#000080>// takes the contents of a file in the form of a string</font></i>
-<i><font color=
-#000080>// and searches for all the C++ class definitions, storing</font></i>
-<i><font color=
-#000080>// their locations in a map of strings/int's</font></i>
-
-<b>typedef</b> std::map&lt;std::string, std::string::difference_type, std::less&lt;std::string&gt; &gt; map_type;
-
-<b>const</b> <b>char</b>* re = 
-   <i><font color=
-#000080>// possibly leading whitespace:  </font></i> 
-   <font color="#0000ff">"^[[:space:]]*"</font> 
-   <i><font color=
-#000080>// possible template declaration:</font></i>
-   <font color=
-#0000ff>"(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?"</font>
-   <i><font color="#000080">// class or struct:</font></i>
-   <font color="#0000ff">"(class|struct)[[:space:]]*"</font> 
-   <i><font color=
-#000080>// leading declspec macros etc:</font></i>
-   <font color="#0000ff">"("</font>
-      <font color="#0000ff">"\\&lt;\\w+\\&gt;"</font>
-      <font color="#0000ff">"("</font>
-         <font color="#0000ff">"[[:blank:]]*\\([^)]*\\)"</font>
-      <font color="#0000ff">")?"</font>
-      <font color="#0000ff">"[[:space:]]*"</font>
-   <font color="#0000ff">")*"</font> 
-   <i><font color="#000080">// the class name</font></i>
-   <font color="#0000ff">"(\\&lt;\\w*\\&gt;)[[:space:]]*"</font> 
-   <i><font color=
-#000080>// template specialisation parameters</font></i>
-   <font color="#0000ff">"(&lt;[^;:{]+&gt;)?[[:space:]]*"</font>
-   <i><font color="#000080">// terminate in { or :</font></i>
-   <font color="#0000ff">"(\\{|:[^;\\{()]*\\{)"</font>;
-
-
-boost::regex expression(re);
-map_type class_index;
-
-<b>bool</b> regex_callback(<b>const</b> boost::match_results&lt;std::string::const_iterator&gt;&amp; what)
-{
-   <i><font color=
-#000080>// what[0] contains the whole string</font></i>
-   <i><font color=
-#000080>// what[5] contains the class name.</font></i>
-   <i><font color=
-#000080>// what[6] contains the template specialisation if any.</font></i>
-   <i><font color=
-#000080>// add class name and position to map:</font></i>
-   class_index[what[<font color=
-#0000a0>5</font>].str() + what[<font color=
-#0000a0>6</font>].str()] = what.position(<font color=
-#0000a0>5</font>);
-   <b>return</b> <b>true</b>;
-}
-
-<b>void</b> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   s.reserve(is.rdbuf()-&gt;in_avail());
-   <b>char</b> c;
-   <b>while</b>(is.get(c))
-   {
-      <b>if</b>(s.capacity() == s.size())
-         s.reserve(s.capacity() * <font color="#0000a0">3</font>);
-      s.append(<font color="#0000a0">1</font>, c);
-   }
-}
-
-<b>int</b> main(<b>int</b> argc, <b>const</b> <b>char</b>** argv)
-{
-   std::string text;
-   <b>for</b>(<b>int</b> i = <font color=
-#0000a0>1</font>; i &lt; argc; ++i)
-   {
-      cout &lt;&lt; <font color=
-#0000ff>"Processing file "</font> &lt;&lt; argv[i] &lt;&lt; endl;
-      std::ifstream fs(argv[i]);
-      load_file(text, fs);
-      <i><font color=
-#000080>// construct our iterators:</font></i>
-      boost::sregex_iterator m1(text.begin(), text.end(), expression);
-      boost::sregex_iterator m2;
-      std::for_each(m1, m2, &amp;regex_callback);
-      <i><font color="#000080">// copy results:</font></i>
-      cout &lt;&lt; class_index.size() &lt;&lt; <font color=
-#0000ff>" matches found"</font> &lt;&lt; endl;
-      map_type::iterator c, d;
-      c = class_index.begin();
-      d = class_index.end();
-      <b>while</b>(c != d)
-      {
-         cout &lt;&lt; <font color=
-#0000ff>"class \""</font> &lt;&lt; (*c).first &lt;&lt; <font
-color=
-#0000ff>"\" found at index: "</font> &lt;&lt; (*c).second &lt;&lt; endl;
-         ++c;
-      }
-      class_index.erase(class_index.begin(), class_index.end());
-   }
-   <b>return</b> <font color="#0000a0">0</font>;
-}
-</pre>
-      <hr>
-      <p>Revised&nbsp;&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         06 Jan 05&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2005<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex_iterator.qbk b/doc/regex_iterator.qbk
new file mode 100644
index 00000000..9789bcae
--- /dev/null
+++ b/doc/regex_iterator.qbk
@@ -0,0 +1,307 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_iterator regex_iterator]
+
+The iterator type [regex_iterator] will enumerate all of the regular expression 
+matches found in some sequence: dereferencing a [regex_iterator] yields a 
+reference to a [match_results] object.
+
+   template <class BidirectionalIterator, 
+            class charT = iterator_traits<BidirectionalIterator>::value_type,
+            class traits = regex_traits<charT> >
+   class regex_iterator 
+   {
+   public:
+      typedef          basic_regex<charT, traits>                              regex_type;
+      typedef          match_results<BidirectionalIterator>                    value_type;
+      typedef typename iterator_traits<BidirectionalIterator>::difference_type difference_type;
+      typedef          const value_type*                                       pointer;
+      typedef          const value_type&                                       reference;
+      typedef          std::forward_iterator_tag                               iterator_category;
+      
+      ``[link boost_regex.regex_iterator.construct1 regex_iterator]``();
+      ``[link boost_regex.regex_iterator.construct2 regex_iterator]``(BidirectionalIterator a, BidirectionalIterator b, 
+                     const regex_type& re, 
+                     match_flag_type m = match_default);
+      ``[link boost_regex.regex_iterator.construct3 regex_iterator]``(const regex_iterator&);
+      regex_iterator& ``[link boost_regex.regex_iterator.assign operator=(]``const regex_iterator&);
+      bool ``[link boost_regex.regex_iterator.op_eq operator==]``(const regex_iterator&)const;
+      bool ``[link boost_regex.regex_iterator.op_ne operator!=]``(const regex_iterator&)const;
+      const value_type& ``[link boost_regex.regex_iterator.op_deref operator*]``()const;
+      const value_type* ``[link boost_regex.regex_iterator.op_arrow operator->]``()const;
+      regex_iterator& ``[link boost_regex.regex_iterator.op_inc operator++]``();
+      regex_iterator ``[link boost_regex.regex_iterator.op_inc2 operator++]``(int);
+   };
+
+   typedef regex_iterator<const char*>                  cregex_iterator; 
+   typedef regex_iterator<std::string::const_iterator>  sregex_iterator; 
+   
+   #ifndef  BOOST_NO_WREGEX
+   typedef regex_iterator<const wchar_t*>               wcregex_iterator; 
+   typedef regex_iterator<std::wstring::const_iterator> wsregex_iterator; 
+   #endif 
+   
+   template <class charT, class traits> regex_iterator<const charT*, charT, traits> 
+      ``[link boost_regex.regex_iterator.make make_regex_iterator]``(const charT* p, const basic_regex<charT, traits>& e, 
+                          regex_constants::match_flag_type m = regex_constants::match_default); 
+                          
+   template <class charT, class traits, class ST, class SA> 
+      regex_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+         ``[link boost_regex.regex_iterator.make make_regex_iterator]``(const std::basic_string<charT, ST, SA>& p, 
+                             const basic_regex<charT, traits>& e, 
+                             regex_constants::match_flag_type m = regex_constants::match_default);
+
+
+[h4 Description]
+
+A [regex_iterator] is constructed from a pair of iterators, and enumerates 
+all occurrences of a regular expression within that iterator range.
+
+[#boost_regex.regex_iterator.construct1]
+
+   regex_iterator();
+
+[*Effects]: constructs an end of sequence [regex_iterator].
+
+[#boost_regex.regex_iterator.construct2]
+
+   regex_iterator(BidirectionalIterator a, BidirectionalIterator b, 
+                  const regex_type& re, 
+                  match_flag_type m = match_default);
+
+[*Effects]: constructs a [regex_iterator] that will enumerate all occurrences of 
+the expression /re/, within the sequence \[a,b), and found using [match_flag_type] /m/.  
+The object /re/ must exist for the lifetime of the [regex_iterator].
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the program 
+runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted 
+memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[#boost_regex.regex_iterator.construct3]
+
+   regex_iterator(const regex_iterator& that);
+
+[*Effects]: constructs a copy of `that`.
+
+[*Postconditions]: `*this == that`.
+
+
+[#boost_regex.regex_iterator.assign]
+
+   regex_iterator& operator=(const regex_iterator&);
+
+[*Effects]: sets `*this` equal to those in `that`.
+
+[*Postconditions]: *this == that.
+
+
+[#boost_regex.regex_iterator.op_eq]
+
+   bool operator==(const regex_iterator& that)const;
+
+[*Effects]: returns true if *this is equal to that.
+
+
+[#boost_regex.regex_iterator.op_ne]
+
+   bool operator!=(const regex_iterator&)const;
+
+[*Effects]: returns `!(*this == that)`.
+
+
+[#boost_regex.regex_iterator.op_deref]
+
+   const value_type& operator*()const;
+
+[*Effects]: dereferencing a [regex_iterator] object it yields a const reference 
+to a [match_results] object, whose members are set as follows:
+
+[table
+[[Element][Value]]
+[[`(*it).size()`][`re.mark_count()`]]
+[[`(*it).empty()`][`false`]]
+[[`(*it).prefix().first`][The end of the last match found, or the start 
+   of the underlying sequence if this is the first match enumerated]]
+[[`(*it).prefix().last`][The same as the start of the match found:
+      `(*it)[0].first`]]
+[[`(*it).prefix().matched`][True if the prefix did not match an empty string:
+      `(*it).prefix().first != (*it).prefix().second`]]
+[[`(*it).suffix().first`][The same as the end of the match found:
+      `(*it)[0].second`]]
+[[`(*it).suffix().last`][The end of the underlying sequence.]]
+[[`(*it).suffix().matched`][True if the suffix did not match an empty string:
+      `(*it).suffix().first != (*it).suffix().second`]]
+[[`(*it)[0].first`][The start of the sequence of characters that matched the regular expression]]
+[[`(*it)[0].second`][The end of the sequence of characters that matched the regular expression]]
+[[`(*it)[0].matched`][true if a full match was found, and false if it was a partial match (found as a result of the match_partial flag being set).]]
+[[`(*it)[n].first`][For all integers `n < (*it).size()`, the start of the sequence 
+         that matched sub-expression /n/. Alternatively, if sub-expression /n/ 
+         did not participate in the match, then last.]]
+[[`(*it)[n].second`][For all integers `n < (*it).size()`, the end of the sequence 
+      that matched sub-expression /n/. Alternatively, if sub-expression /n/ did 
+      not participate in the match, then last.]]
+[[`(*it)[n].matched`][For all integers `n < (*it).size()`, true if sub-expression /n/ 
+      participated in the match, false otherwise.]]
+[[`(*it).position(n)`][For all integers `n < (*it).size()`, then the distance from 
+      the start of the underlying sequence to the start of sub-expression match /n/.]]
+]
+
+
+[#boost_regex.regex_iterator.op_arrow]
+
+   const value_type* operator->()const;
+
+[*Effects]: returns `&(*this)`.
+
+
+[#boost_regex.regex_iterator.op_inc]
+
+   regex_iterator& operator++();
+
+[*Effects]: moves the iterator to the next match in the underlying sequence, or 
+the end of sequence iterator if none if found.  When the last match found 
+matched a zero length string, then the [regex_iterator] will find the next match as 
+follows: if there exists a non-zero length match that starts at the same 
+location as the last one, then returns it, otherwise starts looking for the 
+next (possibly zero length) match from one position to the right of the last match.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the 
+program runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted 
+memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[*Returns]: *this.
+
+
+[#boost_regex.regex_iterator.op_inc2]
+
+   regex_iterator operator++(int);
+
+[*Effects]: constructs a copy result of `*this`, then calls `++(*this)`.
+
+[*Returns]: result.
+
+[#boost_regex.regex_iterator.make]
+
+   template <class charT, class traits> 
+   regex_iterator<const charT*, charT, traits>
+      make_regex_iterator(const charT* p, const basic_regex<charT, traits>& e, 
+                        regex_constants::match_flag_type m = regex_constants::match_default); 
+                       
+   template <class charT, class traits, class ST, class SA> 
+   regex_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+      make_regex_iterator(const std::basic_string<charT, ST, SA>& p, 
+                        const basic_regex<charT, traits>& e, 
+                        regex_constants::match_flag_type m = regex_constants::match_default);
+
+[*Effects]: returns an iterator that enumerates all occurences of expression /e/ 
+in text /p/ using [match_flag_type] /m/.
+
+[h4 Examples]
+
+The following example takes a C++ source file and builds up an index of class 
+names, and the location of that class in the file.
+
+   #include <string>
+   #include <map>
+   #include <fstream>
+   #include <iostream>
+   #include <boost/regex.hpp>
+
+   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
+
+   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:
+      "("
+         "\\<\\w+\\>"
+         "("
+            "[[:blank:]]*\\([^)]*\\)"
+         ")?"
+         "[[:space:]]*"
+      ")*" 
+      // the class name
+      "(\\<\\w*\\>)[[:space:]]*" 
+      // template specialisation parameters
+      "(<[^;:{]+>)?[[:space:]]*"
+      // terminate in { or :
+      "(\\{|:[^;\\{()]*\\{)";
+
+
+   boost::regex expression(re);
+   map_type class_index;
+
+   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);
+      return true;
+   }
+
+   void load_file(std::string& s, std::istream& is)
+   {
+      s.erase();
+      s.reserve(is.rdbuf()->in_avail());
+      char c;
+      while(is.get(c))
+      {
+         if(s.capacity() == s.size())
+            s.reserve(s.capacity() * 3);
+         s.append(1, c);
+      }
+   }
+
+   int main(int argc, const char** argv)
+   {
+      std::string text;
+      for(int i = 1; i < argc; ++i)
+      {
+         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);
+         boost::sregex_iterator m2;
+         std::for_each(m1, m2, &regex_callback);
+         // copy results:
+         cout << class_index.size() << " matches found" << endl;
+         map_type::iterator c, d;
+         c = class_index.begin();
+         d = class_index.end();
+         while(c != d)
+         {
+            cout << "class \"" << (*c).first << "\" found at index: " << (*c).second << endl;
+            ++c;
+         }
+         class_index.erase(class_index.begin(), class_index.end());
+      }
+      return 0;
+   }
+
+
+[endsect]
+
diff --git a/doc/regex_match.html b/doc/regex_match.html
deleted file mode 100644
index 31c5eba6..00000000
--- a/doc/regex_match.html
+++ /dev/null
@@ -1,318 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_match</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_match</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a> <dt><a href="#examples">
-                     Examples</a></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <PRE><A name=query_match></A>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P>
-      The algorithm regex _match determines whether a given regular expression 
-      matches all of a given character sequence denoted by a pair of 
-      bidirectional-iterators, the algorithm is defined as follows, the main use of 
-      this function is data input validation.
-      <P><STRONG>Note that the result is true only if the expression matches the whole of 
-            the input sequence.&nbsp;</STRONG> If you want to search for an expression 
-         somewhere within the sequence then use <A href="regex_search.html">regex_search</A>.&nbsp; 
-         If you want to match a prefix of the character string then use <A href="regex_search.html">
-            regex_search</A> with the flag <A href="match_flag_type.html">match_continuous</A>
-         set.
-         <PRE>
-template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
-bool <A href="#f1">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
-                 <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class BidirectionalIterator, class charT, class traits&gt;
-bool <A href="#f2">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class charT, class Allocator, class traits&gt;
-bool <A href="#f3">regex_match</A>(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class ST, class SA, class Allocator, class charT, class traits&gt;
-bool <A href="#f4">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class charT, class traits&gt;
-bool <A href="#f5">regex_match</A>(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
-
-template &lt;class ST, class SA, class charT, class traits&gt;
-bool <A href="#f6">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-</PRE>
-         <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
-bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                 <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
-         Bidirectional Iterator (24.1.4).</P>
-      <P><B> Effects: </B>Determines whether there is an exact match between the regular 
-         expression <I>e</I>, and all of the character sequence [first, last), parameter <I>
-            flags</I> is used to <A href="match_flag_type.html">control how the expression 
-            is matched</A> against the character sequence. Returns true if such a match 
-         exists, false otherwise.</P>
-      <P><STRONG>Throws:</STRONG> <code>std::runtime_error</code> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><B> Postconditions: </B>If the function returns false, then the effect on 
-         parameter <I>m</I> is undefined, otherwise the effects on parameter <I>m</I> are 
-         given in the table:</P>
-      <P align="center">
-         <CENTER>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="7" width="624" border="1">
-               <TBODY>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P><B> Element</B>
-                        </P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P><B> Value</B>
-                        </P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.size()</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>e.mark_count()</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.empty()</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>false</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.prefix().first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>first</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.prefix().last</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>first</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.prefix().matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>false</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.suffix().first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>last</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.suffix().last</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>last</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m.suffix().matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>false</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[0].first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>first</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[0].second</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>last</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[0].matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P><CODE> true</CODE> if a full match was found, and <CODE>false</CODE> if it was 
-                           a partial match (found as a result of the <CODE>match_partial</CODE> flag being 
-                           set).</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[n].first</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>For all integers n &lt; m.size(), the start of the sequence that matched 
-                           sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                           in the match, then <I>last</I>.</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[n].second</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>For all integers n &lt; m.size(), the end of the sequence that matched 
-                           sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                           in the match, then <I>last</I>.</P>
-                     </TD>
-                  </TR>
-                  <TR>
-                     <TD vAlign="top" width="50%">
-                        <P>m[n].matched</P>
-                     </TD>
-                     <TD vAlign="top" width="50%">
-                        <P>For all integers n &lt; m.size(), true if sub-expression <I>n</I> participated 
-                           in the match, false otherwise.</P>
-                     </TD>
-                  </TR>
-               </TBODY></TD></TR></TABLE>
-         </CENTER>
-      <P></P>
-      <DIV></DIV>
-      <PRE>&nbsp;</PRE>
-      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits&gt;
-bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><A href="match_results.html">
-               match_results</A>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
-         and then returning the result of <CODE>regex_match(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f3></A>template &lt;class charT, class Allocator, class traits&gt;
-bool regex_match(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
-            char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class ST, class SA, class Allocator,
-          class charT, class traits&gt;
-bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), m, e, 
-            flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
-bool regex_match(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
-            char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
-bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), e, 
-            flags)</CODE>.
-         <H3><A name="examples"></A>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_match_example.cpp">example</A>
-      processes an ftp response:
-      <P></P>
-      <PRE><FONT color=#008000>#include &lt;stdlib.h&gt; 
-#include &lt;boost/regex.hpp&gt; 
-#include &lt;string&gt; 
-#include &lt;iostream&gt; 
-
-</FONT><B>using namespace</B> boost; 
-
-regex expression(<FONT color=#000080>"([0-9]+)(\\-| |$)(.*)"</FONT>); 
-
-<FONT color=#000080><I>// process_ftp: 
-// on success returns the ftp response code, and fills 
-// msg with the ftp response message. 
-</I></FONT><B>int</B> process_ftp(<B>const</B> <B>char</B>* response, std::string* msg) 
-{ 
-&nbsp;&nbsp; cmatch what; 
-&nbsp;&nbsp; <B>if</B>(regex_match(response, what, expression)) 
-&nbsp;&nbsp; { 
-<FONT color=#000080>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[0] contains the whole string 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[1] contains the response code 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[2] contains the separator character 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[3] contains the text message. 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <B>if</B>(msg) 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; msg-&gt;assign(what[3].first, what[3].second); 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <B>return</B> std::atoi(what[1].first); 
-&nbsp;&nbsp; } 
-<FONT color=#000080>&nbsp;&nbsp; <I>// failure did not match 
-</I></FONT>&nbsp;&nbsp; <B>if</B>(msg) 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; msg-&gt;erase(); 
-&nbsp;&nbsp; <B>return</B> -1; 
-}
-      <P>
-         <HR></PRE>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex_match.qbk b/doc/regex_match.qbk
new file mode 100644
index 00000000..55856c41
--- /dev/null
+++ b/doc/regex_match.qbk
@@ -0,0 +1,184 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_match regex_match]
+
+   #include <boost/regex.hpp> 
+
+The algorithm [regex_match] determines whether a given regular expression 
+matches [*all] of a given character sequence denoted by a pair of 
+bidirectional-iterators, the algorithm is defined as follows, 
+the main use of this function is data input validation.
+
+[important Note that the result is true only if the expression matches the 
+*whole* of the input sequence.  If you want to search for an 
+expression somewhere within the sequence then use [regex_search].  If you 
+want to match a prefix of the character string then use [regex_search] 
+with the flag match_continuous set.]
+
+   template <class BidirectionalIterator, class Allocator, class charT, class traits>
+   bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
+                    match_results<BidirectionalIterator, Allocator>& m,
+                    const basic_regex <charT, traits>& e,
+                    match_flag_type flags = match_default); 
+
+   template <class BidirectionalIterator, class charT, class traits>
+   bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
+                    const basic_regex <charT, traits>& e,
+                    match_flag_type flags = match_default); 
+
+   template <class charT, class Allocator, class traits>
+   bool regex_match(const charT* str, match_results<const charT*, Allocator>& m,
+                    const basic_regex <charT, traits>& e,
+                    match_flag_type flags = match_default); 
+
+   template <class ST, class SA, class Allocator, class charT, class traits>
+   bool regex_match(const basic_string<charT, ST, SA>& s,
+                    match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m, 
+                    const basic_regex <charT, traits>& e, 
+                    match_flag_type flags = match_default); 
+
+   template <class charT, class traits>
+   bool regex_match(const charT* str,
+                    const basic_regex <charT, traits>& e,
+                    match_flag_type flags = match_default); 
+  
+   template <class ST, class SA, class charT, class traits>
+   bool regex_match(const basic_string<charT, ST, SA>& s,
+                    const basic_regex <charT, traits>& e,
+                    match_flag_type flags = match_default);
+
+[h4 Description]
+
+   template <class BidirectionalIterator, class Allocator, class charT, class traits>
+   bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
+                    match_results<BidirectionalIterator, Allocator>& m,
+                    const basic_regex <charT, traits>& e,
+                    match_flag_type flags = match_default);
+
+[*Requires]: Type BidirectionalIterator meets the requirements of a 
+Bidirectional Iterator (24.1.4).
+
+[*Effects]: Determines whether there is an exact match between the regular expression /e/, 
+and all of the character sequence \[first, last), parameter /flags/ 
+(see [match_flag_type]) is used to 
+control how the expression is matched against the character sequence. 
+Returns true if such a match exists, false otherwise.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the 
+program runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted 
+memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[*Postconditions]: If the function returns false, then the effect on 
+parameter /m/ is undefined, otherwise the effects on parameter /m/ are 
+given in the table:
+
+[table
+[[Element][Value]]
+[[`m.size()`][`e.mark_count()`]]
+[[`m.empty()`][`false`]]
+[[`m.prefix().first`][`first`]]
+[[`m.prefix().last`][`first`]]
+[[`m.prefix().matched`][`false`]]
+[[`m.suffix().first`][`last`]]
+[[`m.suffix().last`][`last`]]
+[[`m.suffix().matched`][`false`]]
+[[`m[0].first`][`first`]]
+[[`m[0].second`][`last`]]
+[[`m[0].matched`][true if a full match was found, and false if it was a 
+partial match (found as a result of the match_partial flag being set).]]
+[[`m[n].first`][For all integers `n < m.size()`, the start of the sequence that 
+   matched sub-expression /n/. Alternatively, if sub-expression /n/ did not 
+   participate in the match, then `last`.]]
+[[`m[n].second`][For all integers `n < m.size()`, the end of the sequence that 
+      matched sub-expression /n/. Alternatively, if sub-expression /n/ did not 
+      participate in the match, then `last`.]]
+[[`m[n].matched`][For all integers `n < m.size()`, true if sub-expression /n/ 
+      participated in the match, false otherwise.]]
+]
+ 
+
+   template <class BidirectionalIterator, class charT, class traits>
+   bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
+                  const basic_regex <charT, traits>& e,
+                  match_flag_type flags = match_default);
+
+[*Effects]: Behaves "as if" by constructing an instance of 
+`match_results<BidirectionalIterator> what`, and then returning the result of 
+`regex_match(first, last, what, e, flags)`.
+
+   template <class charT, class Allocator, class traits>
+   bool regex_match(const charT* str, match_results<const charT*, Allocator>& m,
+                  const basic_regex <charT, traits>& e,
+                  match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_match(str, str + char_traits<charT>::length(str), m, e, flags)`.
+
+   template <class ST, class SA, class Allocator,
+            class charT, class traits>
+   bool regex_match(const basic_string<charT, ST, SA>& s,
+                  match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m, 
+                  const basic_regex <charT, traits>& e, 
+                  match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_match(s.begin(), s.end(), m, e, flags)`.
+
+   template <class charT, class traits>
+   bool regex_match(const charT* str,
+                  const basic_regex <charT, traits>& e,
+                  match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_match(str, str + char_traits<charT>::length(str), e, flags)`.
+
+   template <class ST, class SA, class charT, class traits>
+   bool regex_match(const basic_string<charT, ST, SA>& s,
+                  const basic_regex <charT, traits>& e,
+                  match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_match(s.begin(), s.end(), e, flags)`.
+
+[h4 Examples]
+
+The following example processes an ftp response:
+
+   #include <stdlib.h> 
+   #include <boost/regex.hpp> 
+   #include <string> 
+   #include <iostream> 
+
+   using namespace boost; 
+
+   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) 
+   { 
+      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) 
+            msg->assign(what[3].first, what[3].second); 
+         return std::atoi(what[1].first); 
+      } 
+      // failure did not match 
+      if(msg) 
+         msg->erase(); 
+      return -1; 
+   }
+      
+
+[endsect]
+
diff --git a/doc/regex_merge.html b/doc/regex_merge.html
deleted file mode 100644
index bbfcc23b..00000000
--- a/doc/regex_merge.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_merge (deprecated)</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_merge (deprecated)</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Algorithm regex_merge has been renamed <A href="regex_replace.html">regex_replace</A>, 
-         existing code will continue to compile, but new code should use <A href="regex_replace.html">
-            regex_replace</A> instead.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/regex_replace.html b/doc/regex_replace.html
deleted file mode 100644
index 2005ccb0..00000000
--- a/doc/regex_replace.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_replace</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_replace</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a> <dt><A href="#examples">
-                     Examples</A></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <PRE>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P>The algorithm regex_replace&nbsp;searches&nbsp;through&nbsp;a string finding 
-         all the matches to the regular expression: for each match it then calls <A href="match_results.html#format">
-            match_results::format</A> to format the string and sends the result to the 
-         output iterator. Sections of text that do not match are copied to the output 
-         unchanged only if the <EM>flags</EM> parameter does not have the flag <A href="match_flag_type.html">
-            format_no_copy</A> set. If the flag <A href="match_flag_type.html">format_first_only</A>
-         is set then only the first occurrence is replaced rather than all 
-         occurrences.&nbsp;<PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
-OutputIterator <A href="#f1">regex_replace</A>(OutputIterator out,
-                           BidirectionalIterator first,
-                           BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                           const basic_string&lt;charT&gt;&amp; fmt,
-                           <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
-
-template &lt;class traits, class charT&gt;
-basic_string&lt;charT&gt; <A href="#f2">regex_replace</A>(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                            const basic_string&lt;charT&gt;&amp; fmt,
-                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
-
-</PRE>
-         <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
-OutputIterator regex_replace(OutputIterator out,
-                           BidirectionalIterator first,
-                           BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                           const basic_string&lt;charT&gt;&amp; fmt,
-                           <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
-      <P>Enumerates all the occurences of expression <EM>e</EM> in the sequence [first, 
-         last), replacing each occurence with the string that results by merging the 
-         match found with the format string <EM>fmt</EM>, and copies the resulting 
-         string to <EM>out</EM>.&nbsp;</P>
-      <P>If the flag format_no_copy is set in <EM>flags</EM> then unmatched sections of 
-         text are not copied to output.&nbsp;
-      </P>
-      <P>If the flag format_first_only is set in <EM>flags</EM> then only the first 
-         occurence of <EM>e</EM> is replaced.&nbsp;
-      </P>
-      <P>The manner in which the format string <EM>fmt</EM> is interpretted, along with 
-         the rules used&nbsp;for finding matches,&nbsp;are determined by the <A href="match_flag_type.html">
-            flags</A> set in <EM>flags</EM></P>
-      <P><B>Effects:</B> Constructs an
-         <SPAN class="spelle">regex_iterator</SPAN>
-         object:
-      </P>
-      <PRE><SPAN style="FONT-SIZE: 10pt">regex_iterator&lt;</SPAN><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">BidirectionalIterator</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt">, </SPAN><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">charT</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt">, traits, Allocator&gt; <BR>                                            </SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">i(</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt">first, last, e, flags)</SPAN>, </PRE>
-      <P>and uses
-         <SPAN class="spelle">
-            <I>i</I></SPAN>
-         to enumerate through all of the matches <I>m</I> of type
-         <SPAN class="spelle">
-            <SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">match_results</SPAN>
-         </SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">&lt;<SPAN class="spelle">BidirectionalIterator</SPAN>&gt; </SPAN>that 
-         occur within the sequence [first, last).
-      </P>
-      <P>If no such matches are found
-         <SPAN class="grame">and </SPAN></P>
-      <PRE><SPAN class=grame></SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">!</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(flags &amp; <SPAN class=spelle>format_no_copy</SPAN>)</SPAN> </PRE>
-      <P>then calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">std::copy</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(first, last, out)</SPAN>. </PRE>
-      <P>Otherwise, for each match found,
-         <SPAN class="grame">if </SPAN></P>
-      <PRE><SPAN class=grame></SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">!</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(flags &amp; <SPAN class=spelle>format_no_copy</SPAN>)</SPAN> </PRE>
-      <P>calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">std::copy</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(<SPAN class=spelle>m.prefix</SPAN>().first, <SPAN class=spelle>m.prefix</SPAN>().last, out)</SPAN>, </PRE>
-      <P>and then calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">m.format</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(out, <SPAN class=spelle>fmt</SPAN>, flags)</SPAN>. </PRE>
-      <P>Finally
-         <SPAN class="grame">if </SPAN></P>
-      <PRE><SPAN class=grame></SPAN><SPAN class=grame><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">!</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(flags &amp; <SPAN class=spelle>format_no_copy</SPAN>)</SPAN> </PRE>
-      <P>calls
-      </P>
-      <PRE><SPAN class=spelle><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">std::copy</SPAN></SPAN><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">(<SPAN class=spelle>last_m.suffix</SPAN>().first, <SPAN class=spelle>last_m,suffix</SPAN>().last, out) </SPAN></PRE>
-      <P><SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'"></SPAN>where
-         <SPAN class="spelle">
-            <SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">last_m</SPAN>
-         </SPAN>
-         is a copy of the last match found.
-      </P>
-      <P>If
-         <SPAN style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'">flags &amp; 
-<SPAN class="spelle">format_first_only</SPAN></SPAN>
-         is non-zero then only the first match found is replaced.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><B> Returns:</B> <CODE>out</CODE>.
-      </P>
-      <PRE><A name=f2></A>template &lt;class traits, class charT&gt;
-basic_string&lt;charT&gt; regex_replace(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
-                            const basic_string&lt;charT&gt;&amp; fmt,
-                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
-      <P><B> Effects:</B> Constructs an object <CODE>basic_string&lt;charT&gt; result</CODE>, 
-         calls <CODE>regex_replace(back_inserter(result), s.begin(), s.end(), e, fmt, 
-            flags)</CODE>, and then returns <CODE>result</CODE>.
-         <H3><A name="examples"></A>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_replace_example.cpp">example</A>
-         takes C/C++ source code as input, and outputs syntax highlighted HTML code.</P>
-      <P></P>
-      <PRE><FONT color=#008080>#include &lt;fstream&gt;
-#include &lt;sstream&gt;
-#include &lt;string&gt;
-#include &lt;iterator&gt;
-#include &lt;boost/regex.hpp&gt;
-#include &lt;fstream&gt;
-#include &lt;iostream&gt;
-</FONT>
-<FONT color=#000080><I>// purpose:
-// takes the contents of a file and transform to
-// syntax highlighted code in html format
-</I></FONT>
-boost::regex e1, e2;
-<B>extern</B> <B>const</B> <B>char</B>* expression_text;
-<B>extern</B> <B>const</B> <B>char</B>* format_string;
-<B>extern</B> <B>const</B> <B>char</B>* pre_expression;
-<B>extern</B> <B>const</B> <B>char</B>* pre_format;
-<B>extern</B> <B>const</B> <B>char</B>* header_text;
-<B>extern</B> <B>const</B> <B>char</B>* footer_text;
-
-<B>void</B> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   s.reserve(is.rdbuf()-&gt;in_avail());
-   <B>char</B> c;
-   <B>while</B>(is.get(c))
-   {
-      <B>if</B>(s.capacity() == s.size())
-         s.reserve(s.capacity() * <FONT color=#000080>3</FONT>);
-      s.append(<FONT color=#000080>1</FONT>, c);
-   }
-}
-
-<B>int</B> main(<B>int</B> argc, <B>const</B> <B>char</B>** argv)
-{
-   try{
-   e1.assign(expression_text);
-   e2.assign(pre_expression);
-   <B>for</B>(<B>int</B> i = <FONT color=#000080>1</FONT>; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#0000ff>"Processing file "</FONT> &lt;&lt; argv[i] &lt;&lt; std::endl;
-      std::ifstream fs(argv[i]);
-      std::string in;
-      load_file(in, fs);
-      std::string out_name(std::string(argv[i]) + std::string(<FONT color=#0000ff>".htm"</FONT>));
-      std::ofstream os(out_name.c_str());
-      os &lt;&lt; header_text;
-      <FONT color=#000080><I>// strip '&lt;' and '&gt;' first by outputting to a
-</I></FONT>      <FONT color=#000080><I>// temporary string stream
-</I></FONT>      std::ostringstream t(std::ios::out | std::ios::binary);
-      std::ostream_iterator&lt;<B>char</B>, <B>char</B>&gt; oi(t);
-      boost::regex_replace(oi, in.begin(), in.end(),
-      e2, pre_format, boost::match_default | boost::format_all);
-      <FONT color=#000080><I>// then output to final output stream
-</I></FONT>      <FONT color=#000080><I>// adding syntax highlighting:
-</I></FONT>      std::string s(t.str());
-      std::ostream_iterator&lt;<B>char</B>, <B>char</B>&gt; out(os);
-      boost::regex_replace(out, s.begin(), s.end(),
-      e1, format_string, boost::match_default | boost::format_all);
-      os &lt;&lt; footer_text;
-   }
-   }
-   <STRONG>catch</STRONG>(...)
-   { <STRONG>return</STRONG> -1; }
-   <B>return</B> <FONT color=#000080>0</FONT>;
-}
-
-<B>extern</B> <B>const</B> <B>char</B>* pre_expression = <FONT color=#0000ff>"(&lt;)|(&gt;)|(&amp;)|\\r"</FONT>;
-<B>extern</B> <B>const</B> <B>char</B>* pre_format = <FONT color=#0000ff>"(?1&lt;)(?2&gt;)(?3&amp;amp;)"</FONT>;
-
-
-<B>const</B> <B>char</B>* expression_text = <FONT color=#000080><I>// preprocessor directives: index 1
-</I></FONT>                              <FONT color=#0000ff>"(^[[:blank:]]*#(?:[^\\\\\\n]|\\\\[^\\n[:punct:][:word:]]*[\\n[:punct:][:word:]])*)|"
-</FONT>                              <FONT color=#000080><I>// comment: index 2
-</I></FONT>                              <FONT color=#0000ff>"(//[^\\n]*|/\\*.*?\\*/)|"
-</FONT>                              <FONT color=#000080><I>// literals: index 3
-</I></FONT>                              <FONT color=#0000ff>"\\&lt;([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\\.)?[[:digit:]]+(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\\&gt;|"
-</FONT>                              <FONT color=#000080><I>// string literals: index 4
-</I></FONT>                              <FONT color=#0000ff>"('(?:[^\\\\']|\\\\.)*'|\"(?:[^\\\\\"]|\\\\.)*\")|"
-</FONT>                              <FONT color=#000080><I>// keywords: index 5
-</I></FONT>                              <FONT color=#0000ff>"\\&lt;(__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import"
-</FONT>                              <FONT color=#0000ff>"|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall"
-</FONT>                              <FONT color=#0000ff>"|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|bool"
-</FONT>                              <FONT color=#0000ff>"|break|case|catch|cdecl|char|class|const|const_cast|continue|default|delete"
-</FONT>                              <FONT color=#0000ff>"|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto"
-</FONT>                              <FONT color=#0000ff>"|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected"
-</FONT>                              <FONT color=#0000ff>"|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast"
-</FONT>                              <FONT color=#0000ff>"|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned"
-</FONT>                              <FONT color=#0000ff>"|using|virtual|void|volatile|wchar_t|while)\\&gt;"
-</FONT>                              ;
-
-<B>const</B> <B>char</B>* format_string = <FONT color=#0000ff>"(?1&lt;font color=\"#008040\"&gt;$&amp;&lt;/font&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?2&lt;I&gt;&lt;font color=\"#000080\"&gt;$&amp;&lt;/font&gt;&lt;/I&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?3&lt;font color=\"#0000A0\"&gt;$&amp;&lt;/font&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?4&lt;font color=\"#0000FF\"&gt;$&amp;&lt;/font&gt;)"
-</FONT>                            <FONT color=#0000ff>"(?5&lt;B&gt;$&amp;&lt;/B&gt;)"</FONT>;
-
-<B>const</B> <B>char</B>* header_text = <FONT color=#0000ff>"&lt;HTML&gt;\n&lt;HEAD&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;TITLE&gt;Auto-generated html formated source&lt;/TITLE&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=windows-1252\"&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;/HEAD&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;BODY LINK=\"#0000ff\" VLINK=\"#800080\" BGCOLOR=\"#ffffff\"&gt;\n"
-</FONT>                          <FONT color=#0000ff>"&lt;P&gt; &lt;/P&gt;\n&lt;PRE&gt;"</FONT>;
-
-<B>const</B> <B>char</B>* footer_text = <FONT color=#0000ff>"&lt;/PRE&gt;\n&lt;/BODY&gt;\n\n"</FONT>;
-      </PRE>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex_replace.qbk b/doc/regex_replace.qbk
new file mode 100644
index 00000000..e87c0303
--- /dev/null
+++ b/doc/regex_replace.qbk
@@ -0,0 +1,236 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_replace regex_replace]
+
+   #include <boost/regex.hpp> 
+
+The algorithm [regex_replace] searches through a string finding all the 
+matches to the regular expression: for each match it then calls 
+[match_results_format] to format the string and sends the result to the 
+output iterator. Sections of text that do not match are copied to the 
+output unchanged only if the /flags/ parameter does not have the 
+flag `format_no_copy` set. If the flag `format_first_only` is set then 
+only the first occurrence is replaced rather than all occurrences. 
+
+   template <class OutputIterator, class BidirectionalIterator, class traits, class charT>
+   OutputIterator regex_replace(OutputIterator out,
+                                BidirectionalIterator first,
+                                BidirectionalIterator last,
+                                const basic_regex<charT, traits>& e,
+                                const basic_string<charT>& fmt,
+                                match_flag_type flags = match_default);
+
+   template <class traits, class charT>
+   basic_string<charT> regex_replace(const basic_string<charT>& s,
+                                     const basic_regex<charT, traits>& e,
+                                     const basic_string<charT>& fmt,
+                                     match_flag_type flags = match_default);
+
+
+[h4 Description]
+
+   template <class OutputIterator, class BidirectionalIterator, class traits, class charT>
+   OutputIterator regex_replace(OutputIterator out,
+                                BidirectionalIterator first,
+                                BidirectionalIterator last,
+                                const basic_regex<charT, traits>& e,
+                                const basic_string<charT>& fmt,
+                                match_flag_type flags = match_default);
+
+Enumerates all the occurences of expression /e/ in the sequence \[first, last), 
+replacing each occurence with the string that results by merging the 
+match found with the format string /fmt/, and copies the resulting string to /out/. 
+
+If the flag `format_no_copy` is set in /flags/ then unmatched sections of 
+text are not copied to output. 
+
+If the flag `format_first_only` is set in flags then only the first 
+occurence of /e/ is replaced. 
+
+The manner in which the format string /fmt/ is interpretted, along with the 
+rules used for finding matches, are determined by the flags set in /flags/:
+see [match_flag_type].
+
+[*Effects]: Constructs an [regex_iterator] object:
+
+   regex_iterator<BidirectionalIterator, charT, traits, Allocator> 
+                                             i(first, last, e, flags), 
+
+and uses /i/ to enumerate through all of the matches /m/ of type 
+[match_results] `<BidirectionalIterator>` that occur within the sequence 
+\[first, last).
+
+If no such matches are found and
+
+   !(flags & format_no_copy) 
+
+then calls
+
+   std::copy(first, last, out). 
+
+Otherwise, for each match found, if
+
+   !(flags & format_no_copy) 
+
+calls
+
+   std::copy(m.prefix().first, m.prefix().last, out), 
+
+and then calls
+
+   m.format(out, fmt, flags). 
+
+Finally if
+
+   !(flags & format_no_copy) 
+
+calls
+
+   std::copy(last_m.suffix().first, last_m,suffix().last, out) 
+
+where /last_m/ is a copy of the last match found.
+
+If `flags & format_first_only` is non-zero then only the first match found 
+is replaced.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the 
+program runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted 
+memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[*Returns]: out.
+
+   template <class traits, class charT>
+   basic_string<charT> regex_replace(const basic_string<charT>& s,
+                                     const basic_regex<charT, traits>& e,
+                                     const basic_string<charT>& fmt,
+                                     match_flag_type flags = match_default);
+
+[*Effects]: Constructs an object `basic_string<charT> result`, calls 
+`regex_replace(back_inserter(result), s.begin(), s.end(), e, fmt, flags)`, 
+and then returns `result`.
+
+[h4 Examples]
+
+The following example takes C/C++ source code as input, and outputs 
+syntax highlighted HTML code.
+
+   #include <fstream>
+   #include <sstream>
+   #include <string>
+   #include <iterator>
+   #include <boost/regex.hpp>
+   #include <fstream>
+   #include <iostream>
+
+   // 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;
+   extern const char* pre_expression;
+   extern const char* pre_format;
+   extern const char* header_text;
+   extern const char* footer_text;
+
+   void load_file(std::string& s, std::istream& is)
+   {
+      s.erase();
+      s.reserve(is.rdbuf()->in_avail());
+      char c;
+      while(is.get(c))
+      {
+         if(s.capacity() == s.size())
+            s.reserve(s.capacity() * 3);
+         s.append(1, c);
+      }
+   }
+
+   int main(int argc, const char** argv)
+   {
+      try{
+      e1.assign(expression_text);
+      e2.assign(pre_expression);
+      for(int i = 1; i < argc; ++i)
+      {
+         std::cout << "Processing file " << argv[i] << std::endl;
+         std::ifstream fs(argv[i]);
+         std::string in;
+         load_file(in, fs);
+         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);
+         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());
+         std::ostream_iterator<char, char> out(os);
+         boost::regex_replace(out, s.begin(), s.end(),
+         e1, format_string, boost::match_default | boost::format_all);
+         os << footer_text;
+      }
+      }
+      catch(...)
+      { return -1; }
+      return 0;
+   }
+
+   extern const char* pre_expression = "(<)|(>)|(&)|\\r";
+   extern const char* pre_format = "(?1<)(?2>)(?3&amp;)";
+
+
+   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:]]+"
+      "(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\\>|"
+      // 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"
+      "|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto"
+      "|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected"
+      "|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast"
+      "|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned"
+      "|using|virtual|void|volatile|wchar_t|while)\\>"
+      ;
+
+   const char* format_string = "(?1<font color=\"#008040\">$&</font>)"
+                              "(?2<I><font color=\"#000080\">$&</font></I>)"
+                              "(?3<font color=\"#0000A0\">$&</font>)"
+                              "(?4<font color=\"#0000FF\">$&</font>)"
+                              "(?5<B>$&</B>)";
+
+   const char* header_text = 
+      "<HTML>\n<HEAD>\n"
+      "<TITLE>Auto-generated html formated source</TITLE>\n"
+      "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=windows-1252\">\n"
+      "</HEAD>\n"
+      "<BODY LINK=\"#0000ff\" VLINK=\"#800080\" BGCOLOR=\"#ffffff\">\n"
+      "<P> </P>\n<PRE>";
+
+   const char* footer_text = "</PRE>\n</BODY>\n\n";
+         
+
+[endsect]
+
diff --git a/doc/regex_search.html b/doc/regex_search.html
deleted file mode 100644
index 22691687..00000000
--- a/doc/regex_search.html
+++ /dev/null
@@ -1,315 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_search</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_search</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a> <dt><A href="#examples">
-                     Examples</A></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <PRE>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P></P>
-      <P>The algorithm regex_search will search a range denoted by a pair of 
-         bidirectional-iterators for a given regular expression. The algorithm uses 
-         various heuristics to reduce the search time by only checking for a match if a 
-         match could conceivably start at that position. The algorithm is defined as 
-         follows:
-         <PRE>template &lt;class BidirectionalIterator, 
-          class Allocator, class charT, class traits&gt;
-bool <A href="#f1">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last,
-                  <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
-                  
-template &lt;class ST, class SA, 
-          class Allocator, class charT, class traits&gt; 
-bool <A href="#f2">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s, 
-                  <a href="match_results.html">match_results</a>&lt;
-                      typename basic_string&lt;charT, ST,SA&gt;::const_iterator, 
-                      Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
-          
-template&lt;class charT, class Allocator, class traits&gt; 
-bool <A href="#f3">regex_search</A>(const charT* str, 
-                  <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
-                  
-template &lt;class BidirectionalIterator, class charT, class traits&gt;                
-bool <A href="#f4">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
-                  
-template &lt;class charT, class traits&gt; 
-bool <A href="#f5">regex_search</A>(const charT* str, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
-                  
-template&lt;class ST, class SA, class charT, class traits&gt;
-bool <A href="#f6">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
-</PRE>
-         <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
-bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
-                  <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
-         Bidirectional Iterator (24.1.4).</P>
-      <P><B> Effects: </B>Determines whether there is some sub-sequence within 
-         [first,last) that matches the regular expression <I>e</I>, parameter <I>flags</I>
-         is used to control how the expression is matched against the character 
-         sequence. Returns true if such a sequence exists, false otherwise.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><B> Postconditions: </B>If the function returns false, then the effect on 
-         parameter <I>m</I> is undefined, otherwise the effects on parameter <I>m</I> are 
-         given in the table:</P>
-      <DIV align="center">
-         <CENTER>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="7" width="624" border="1">
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P><B> Element</B></P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P><B> Value</B>
-                     </P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.size()</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>e.mark_count()</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.empty()</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>false</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>first</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().last</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].first</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m.prefix().first != m.prefix().second</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].second</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().last</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>last</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>m.suffix().first != m.suffix().second</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>The start of the sequence of characters that matched the regular expression</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].second</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>The end of the sequence of characters that matched the regular expression</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[0].matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P><CODE> true</CODE> if a full match was found, and <CODE>false</CODE> if it was 
-                        a partial match (found as a result of the <CODE>match_partial</CODE> flag being 
-                        set).</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[n].first</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>For all integers n &lt; m.size(), the start of the sequence that matched 
-                        sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                        in the match, then <I>last</I>.</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[n].second</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>For all integers n &lt; m.size(), the end of the sequence that matched 
-                        sub-expression <I>n</I>. Alternatively, if sub-expression n did not participate 
-                        in the match, then <I>last</I>.</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="50%">
-                     <P>m[n].matched</P>
-                  </TD>
-                  <TD vAlign="top" width="50%">
-                     <P>For all integers n &lt; m.size(), true if sub-expression <I>n</I> participated 
-                        in the match, false otherwise.</P>
-                  </TD>
-               </TR>
-               </TD></TR></TABLE>
-         </CENTER>
-      </DIV>
-      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits&gt;
-bool regex_search(const charT* str, <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
-            char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
-      <PRE><A name=f3></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits&gt;
-bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  <a href="match_results.html">match_results</a>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), m, 
-            e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class iterator, class charT, class traits&gt;
-bool regex_search(iterator first, iterator last,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><a href="match_results.html">
-               match_results</a>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
-         and then returning the result of <CODE>regex_search(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
-bool regex_search(const charT* str
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
-            char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
-bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
-                  <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
-      <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), e, 
-            flags)</CODE>.
-         <H3><A name="examples"></A>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_search_example.cpp">example</A>, 
-         takes the contents of a file in the form of a string, and searches for all the 
-         C++ class declarations in the file. The code will work regardless of the way 
-         that std::string is implemented, for example it could easily be modified to 
-         work with the SGI rope class, which uses a non-contiguous storage strategy.</P>
-      <P></P>
-      <PRE><FONT color=#008000>#include &lt;string&gt; 
-#include &lt;map&gt; 
-#include &lt;boost/regex.hpp&gt; 
-</FONT><FONT color=#000080><I>
-// 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 
-</I></FONT><B>typedef</B> std::map&lt;std::string, <B>int</B>, std::less&lt;std::string&gt; &gt; map_type; 
-
-boost::regex expression("^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?(class|struct)[[:space:]]*(\\&lt;\\w+\\&gt;([[:blank:]]*\\([^)]*\\))?[[:space:]]*)*(\\&lt;\\w*\\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?(\\{|:[^;\\{()]*\\{)"); 
-<B>
-void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file) 
-{ 
-&nbsp;&nbsp; std::string::const_iterator start, end; 
-&nbsp;&nbsp; start = file.begin(); 
-&nbsp;&nbsp; end = file.end();&nbsp;
-&nbsp;&nbsp; &nbsp;&nbsp; boost::<a href="match_results.html">match_results</a>&lt;std::string::const_iterator&gt; what; 
-&nbsp;&nbsp; boost::match_flag_type flags = boost::match_default; 
-&nbsp;&nbsp; <B>while</B>(regex_search(start, end, what, expression, flags))&nbsp;
-&nbsp;&nbsp; { 
-<FONT color=#000080>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[0] contains the whole string 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[5] contains the class name. 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[6] contains the template specialisation if any. 
-</I>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// add class name and position to map: 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; m[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] =&nbsp;
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; what[5].first - file.begin();&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <FONT color=#000080><I>// update search position: 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; start = what[0].second;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <FONT color=#000080><I>// update flags: 
-</I></FONT>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; flags |= boost::match_prev_avail;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; flags |= boost::match_not_bob;&nbsp;
-&nbsp;&nbsp; } 
-}
-     </PRE>
-      <HR>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         23 June 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex_search.qbk b/doc/regex_search.qbk
new file mode 100644
index 00000000..3b712d0c
--- /dev/null
+++ b/doc/regex_search.qbk
@@ -0,0 +1,193 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_search regex_search]
+
+   #include <boost/regex.hpp> 
+
+The algorithm [regex_search] will search a range denoted by a pair of 
+bidirectional-iterators for a given regular expression. The algorithm 
+uses various heuristics to reduce the search time by only checking 
+for a match if a match could conceivably start at that position. The 
+algorithm is defined as follows:
+
+   template <class BidirectionalIterator, 
+            class Allocator, class charT, class traits>
+   bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
+                     match_results<BidirectionalIterator, Allocator>& m,
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+                     
+   template <class ST, class SA, 
+            class Allocator, class charT, class traits> 
+   bool regex_search(const basic_string<charT, ST, SA>& s, 
+                     match_results<
+                        typename basic_string<charT, ST,SA>::const_iterator, 
+                        Allocator>& m, 
+                     const basic_regex<charT, traits>& e, 
+                     match_flag_type flags = match_default); 
+             
+   template<class charT, class Allocator, class traits> 
+   bool regex_search(const charT* str, 
+                     match_results<const charT*, Allocator>& m, 
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+                     
+   template <class BidirectionalIterator, class charT, class traits>                
+   bool regex_search(BidirectionalIterator first, BidirectionalIterator last, 
+                     const basic_regex<charT, traits>& e, 
+                     match_flag_type flags = match_default); 
+                     
+   template <class charT, class traits> 
+   bool regex_search(const charT* str, 
+                     const basic_regex<charT, traits>& e, 
+                     match_flag_type flags = match_default); 
+                     
+   template<class ST, class SA, class charT, class traits>
+   bool regex_search(const basic_string<charT, ST, SA>& s,
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+
+[h4 Description]
+
+   template <class BidirectionalIterator, class Allocator, class charT, class traits>
+   bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
+                     match_results<BidirectionalIterator, Allocator>& m,
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+
+[*Requires]: Type BidirectionalIterator meets the requirements of a Bidirectional Iterator (24.1.4).
+
+[*Effects]: Determines whether there is some sub-sequence within \[first,last) 
+that matches the regular expression /e/, parameter /flags/ is used to control 
+how the expression is matched against the character sequence. Returns 
+true if such a sequence exists, false otherwise.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the 
+program runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted 
+memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[*Postconditions]: If the function returns false, then the effect on 
+parameter /m/ is undefined, otherwise the effects on parameter /m/ 
+are given in the table:
+
+[table
+[[Element][Value]]
+[[`m.size()`][`e.mark_count()`]]
+[[`m.empty()`][`false`]]
+[[`m.prefix().first`][`first`]]
+[[`m.prefix().last`][`m[0].first`]]
+[[`m.prefix().matched`][`m.prefix().first != m.prefix().second`]]
+[[`m.suffix().first`][`m[0].second`]]
+[[`m.suffix().last`][`last`]]
+[[`m.suffix().matched`][`m.suffix().first != m.suffix().second`]]
+[[`m[0].first`][The start of the sequence of characters that matched the regular expression]]
+[[`m[0].second`][The end of the sequence of characters that matched the regular expression]]
+[[`m[0].matched`][true if a full match was found, and false if it was a partial match (found as a result of the match_partial flag being set).]]
+[[`m[n].first`][For all integers `n < m.size()`, the start of the sequence that 
+      matched sub-expression /n/. Alternatively, if sub-expression /n/ did not 
+      participate in the match, then last.]]
+[[`m[n].second`][For all integers `n < m.size()`, the end of the sequence that 
+      matched sub-expression /n/. Alternatively, if sub-expression /n/ did not 
+      participate in the match, then `last`.]]
+[[`m[n].matched`][For all integers `n < m.size()`, true if sub-expression /n/ 
+      participated in the match, false otherwise.]]
+]
+
+   template <class charT, class Allocator, class traits>
+   bool regex_search(const charT* str, match_results<const charT*, Allocator>& m,
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_search(str, str + char_traits<charT>::length(str), m, e, flags)`.
+
+   template <class ST, class SA, class Allocator, class charT,
+            class traits>
+   bool regex_search(const basic_string<charT, ST, SA>& s,
+                     match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_search(s.begin(), s.end(), m, e, flags)`.
+
+   template <class iterator, class charT, class traits>
+   bool regex_search(iterator first, iterator last,
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+
+[*Effects]: Behaves "as if" by constructing an instance of 
+`match_results<BidirectionalIterator> what`, and then returning the result of 
+`regex_search(first, last, what, e, flags)`.
+
+   template <class charT, class traits>
+   bool regex_search(const charT* str
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_search(str, str + char_traits<charT>::length(str), e, flags)`.
+
+   template <class ST, class SA, class charT, class traits>
+   bool regex_search(const basic_string<charT, ST, SA>& s,
+                     const basic_regex<charT, traits>& e,
+                     match_flag_type flags = match_default);
+
+[*Effects]: Returns the result of `regex_search(s.begin(), s.end(), e, flags)`.
+
+[h4 Examples]
+
+The following example, takes the contents of a file in the form of a string, 
+and searches for all the C++ class declarations in the file. The code will 
+work regardless of the way that `std::string` is implemented, for example it 
+could easily be modified to work with the SGI rope class, which uses a 
+non-contiguous storage strategy.
+
+   #include <string> 
+   #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; 
+
+   boost::regex expression(
+      "^(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
+      "(class|struct)[[:space:]]*"
+      "(\\<\\w+\\>([[:blank:]]*\\([^)]*\\))?"
+      "[[:space:]]*)*(\\<\\w*\\>)[[:space:]]*"
+      "(<[^;:{]+>[[:space:]]*)?(\\{|:[^;\\{()]*\\{)"); 
+
+   void IndexClasses(map_type& m, const std::string& file) 
+   { 
+      std::string::const_iterator start, end; 
+      start = file.begin(); 
+      end = file.end(); 
+         boost::match_results<std::string::const_iterator> what; 
+      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) 
+               + 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; 
+         flags |= boost::match_not_bob; 
+      } 
+   }
+     
+[endsect]
+
diff --git a/doc/regex_split.html b/doc/regex_split.html
deleted file mode 100644
index a3b7b293..00000000
--- a/doc/regex_split.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Algorithm regex_split (deprecated)</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Algorithm regex_split (deprecated)</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>The algorithm regex_split has been deprecated in favor of the iterator <A href="regex_token_iterator.html">
-            regex_token_iterator</A> which has a more flexible and powerful interface, 
-         as well as following the more usual standard library "pull" rather than "push" 
-         semantics.</P>
-      <P>Code which uses regex_split will continue to compile, the following 
-         documentation is taken from the previous boost.regex version:</P>
-      <H3><A name="regex_split"></A>Algorithm regex_split</H3>
-      <PRE>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt; </PRE>
-      <P>Algorithm regex_split performs a similar operation to the perl split operation, 
-         and comes in three overloaded forms:
-      </P>
-      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
-std::size_t regex_split(OutputIterator out,&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
-&nbsp;<STRONG>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</STRONG>boost::match_flag_type flags,
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::size_t max_split);
-
-<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
-std::size_t regex_split(OutputIterator out,&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boost::match_flag_type flags = match_default);
-
-<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1&gt;
-std::size_t regex_split(OutputIterator out, 
-                        std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s);</PRE>
-      <P><STRONG>Effects: </STRONG>Each version of the algorithm takes an 
-         output-iterator for output, and a string for input. If the expression contains 
-         no marked sub-expressions, then the algorithm writes one string onto the 
-         output-iterator for each section of input that does not match the expression. 
-         If the expression does contain marked sub-expressions, then each time a match 
-         is found, one string for each marked sub-expression will be written to the 
-         output-iterator. No more than <I>max_split </I>strings will be written to the 
-         output-iterator. Before returning, all the input processed will be deleted from 
-         the string <I>s</I> (if <I>max_split </I>is not reached then all of <I>s</I> will 
-         be deleted). Returns the number of strings written to the output-iterator. If 
-         the parameter <I>max_split</I> is not specified then it defaults to UINT_MAX. 
-         If no expression is specified, then it defaults to "\s+", and splitting occurs 
-         on whitespace.
-      </P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <P><A href="../example/snippets/regex_split_example_1.cpp">Example</A>: the 
-         following function will split the input string into a series of tokens, and 
-         remove each token from the string <I>s</I>:
-      </P>
-      <PRE><B>unsigned</B> tokenise(std::list&lt;std::string&gt;&amp; l, std::string&amp; s)
-{
-<B>&nbsp;&nbsp; return</B> boost::regex_split(std::back_inserter(l), s);
-}</PRE>
-      <P><A href="../example/snippets/regex_split_example_2.cpp">Example</A>: the 
-         following short program will extract all of the URL's from a html file, and 
-         print them out to <I>cout</I>:
-      </P>
-      <PRE><FONT color=#008000>#include &lt;list&gt;
-#include &lt;fstream&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/regex.hpp&gt;
-</FONT>
-boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)\""</FONT>,
-               boost::regbase::normal | boost::regbase::icase);
-
-<B>void</B> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   <FONT color=#000080>//
-   // attempt to grow string buffer to match file size,
-   // this doesn't always work...
-</FONT>   s.reserve(is.rdbuf()-&amp;gtin_avail());
-   <B>char</B> c;
-   <B>while</B>(is.get(c))
-   {
-      <FONT color=#000080>// use logarithmic growth stategy, in case
-      // in_avail (above) returned zero:
-</FONT>      <B>if</B>(s.capacity() == s.size())
-         s.reserve(s.capacity() * 3);
-      s.append(1, c);
-   }
-}
-
-
-<B>int</B> main(<B>int</B> argc, <B>char</B>** argv)
-{
-   std::string s;
-   std::list&lt;std::string&gt; l;
-
-   <B>for</B>(<B>int</B> i = 1; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#000080>"Findings URL's in "</FONT> &lt;&lt; argv[i] &lt;&lt; <FONT color=#000080>":"</FONT> &lt;&lt; std::endl;
-      s.erase();
-      std::ifstream is(argv[i]);
-      load_file(s, is);
-      boost::regex_split(std::back_inserter(l), s, e);
-      <B>while</B>(l.size())
-      {
-         s = *(l.begin());
-         l.pop_front();
-         std::cout &lt;&lt; s &lt;&lt; std::endl;
-      }
-   }
-   <B>return</B> 0;
-}</PRE>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June&nbsp;2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex_split.qbk b/doc/regex_split.qbk
new file mode 100644
index 00000000..d05e7f05
--- /dev/null
+++ b/doc/regex_split.qbk
@@ -0,0 +1,122 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_split regex_split (deprecated)]
+
+The algorithm [regex_split] has been deprecated in favor of the iterator 
+[regex_token_iterator] which has a more flexible and powerful interface, 
+as well as following the more usual standard library "pull" rather than 
+"push" semantics.
+
+Code which uses [regex_split] will continue to compile, the following 
+documentation is taken from a previous Boost.Regex version:
+
+   #include <boost/regex.hpp> 
+
+Algorithm [regex_split] performs a similar operation to the perl split operation, 
+and comes in three overloaded forms:
+
+   template <class OutputIterator, class charT, class Traits1, class Alloc1, class Traits2>
+   std::size_t regex_split(OutputIterator out, 
+                           std::basic_string<charT, Traits1, Alloc1>& s, 
+                           const basic_regex<charT, Traits2>& e,
+                           boost::match_flag_type flags,
+                           std::size_t max_split);
+
+   template <class OutputIterator, class charT, class Traits1, class Alloc1, class Traits2>
+   std::size_t regex_split(OutputIterator out, 
+                           std::basic_string<charT, Traits1, Alloc1>& s, 
+                           const basic_regex<charT, Traits2>& e,
+                           boost::match_flag_type flags = match_default);
+
+   template <class OutputIterator, class charT, class Traits1, class Alloc1>
+   std::size_t regex_split(OutputIterator out, 
+                           std::basic_string<charT, Traits1, Alloc1>& s);
+
+[*Effects]: Each version of the algorithm takes an output-iterator for 
+output, and a string for input. If the expression contains no marked 
+sub-expressions, then the algorithm writes one string onto the output-iterator 
+for each section of input that does not match the expression. 
+If the expression does contain marked sub-expressions, then each 
+time a match is found, one string for each marked sub-expression will be 
+written to the output-iterator. No more than max_split strings will be written 
+to the output-iterator. Before returning, all the input processed will be 
+deleted from the string /s/ (if /max_split/ is not reached then all of /s/ 
+will be deleted). Returns the number of strings written to the output-iterator. 
+If the parameter /max_split/ is not specified then it defaults to `UINT_MAX`. 
+If no expression is specified, then it defaults to "\\s+", and splitting occurs 
+on whitespace.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the 
+program runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted 
+memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[*Example]: the following function will split the input string into a 
+series of tokens, and remove each token from the string /s/:
+
+   unsigned tokenise(std::list<std::string>& l, std::string& s)
+   {
+      return boost::regex_split(std::back_inserter(l), s);
+   }
+
+Example: the following short program will extract all of the URL's 
+from a html file, and print them out to cout:
+
+   #include <list>
+   #include <fstream>
+   #include <iostream>
+   #include <boost/regex.hpp>
+
+   boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
+                  boost::regbase::normal | boost::regbase::icase);
+
+   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());
+      char c;
+      while(is.get(c))
+      {
+         // 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);
+      }
+   }
+
+
+   int main(int argc, char** argv)
+   {
+      std::string s;
+      std::list<std::string> l;
+
+      for(int i = 1; i < argc; ++i)
+      {
+         std::cout << "Findings URL's in " << argv[i] << ":" << std::endl;
+         s.erase();
+         std::ifstream is(argv[i]);
+         load_file(s, is);
+         boost::regex_split(std::back_inserter(l), s, e);
+         while(l.size())
+         {
+            s = *(l.begin());
+            l.pop_front();
+            std::cout << s << std::endl;
+         }
+      }
+      return 0;
+   }
+     
+[endsect]
+
diff --git a/doc/regex_token_iterator.html b/doc/regex_token_iterator.html
deleted file mode 100644
index 9bd59050..00000000
--- a/doc/regex_token_iterator.html
+++ /dev/null
@@ -1,381 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: regex_token_iterator</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">regex_token_iterator</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a> <dt><A href="#examples">
-                     Examples</A></dt></dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The template class <CODE>regex_token_iterator</CODE> is an iterator adapter; 
-         that is to say it represents a new view of an existing iterator sequence, by 
-         enumerating all the occurrences of a regular expression within that sequence, 
-         and presenting one or more character sequence for each match found. Each 
-         position enumerated by the iterator is a <A href="sub_match.html">sub_match</A> 
-         object that represents what matched a particular sub-expression within the 
-         regular expression. When class <CODE>regex_token_iterator</CODE> is used to 
-         enumerate a single sub-expression with index -1, then the iterator performs 
-         field splitting: that is to say it enumerates one character sequence for each 
-         section of the character container sequence that does not match the regular 
-         expression specified.</P>
-      <PRE>
-template &lt;class BidirectionalIterator, 
-          class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt; &gt;
-class regex_token_iterator 
-{
-public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
-   typedef          <A href="sub_match.html">sub_match</A>&lt;BidirectionalIterator&gt;                        value_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
-   typedef          const value_type*                                       pointer;
-   typedef          const value_type&amp;                                       reference;
-   typedef          std::forward_iterator_tag                               iterator_category;
-   
-   <A href="#c1">regex_token_iterator</A>();
-   <A href="#c2">regex_token_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                        int submatch = 0, <A href="match_flag_type.html">match_flag_type</A> m = match_default);
-   <A href="#c3">regex_token_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                        const std::vector&lt;int&gt;&amp; submatches, match_flag_type m = match_default);
-   template &lt;std::size_t N&gt;
-   <A href="#c4">regex_token_iterator</A>(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                        const int (&amp;submatches)[N], match_flag_type m = match_default);
-   <A href="#c5">regex_token_iterator</A>(const regex_token_iterator&amp;);
-   regex_token_iterator&amp; <A href="#o1">operator</A>=(const regex_token_iterator&amp;);
-   bool <A href="#o2">operator</A>==(const regex_token_iterator&amp;)const;
-   bool <A href="#o3">operator</A>!=(const regex_token_iterator&amp;)const;
-   const value_type&amp; <A href="#o4">operator</A>*()const;
-   const value_type* <A href="#o5">operator</A>-&gt;()const;
-   regex_token_iterator&amp; <A href="#o6">operator</A>++();
-   regex_token_iterator <A href="#o7">operator</A>++(int);
-};
-
-typedef regex_token_iterator&lt;const char*&gt;                   cregex_token_iterator;
-typedef regex_token_iterator&lt;std::string::const_iterator&gt;   sregex_token_iterator;
-#ifndef BOOST_NO_WREGEX
-typedef regex_token_iterator&lt;const wchar_t*&gt;                wcregex_token_iterator;
-typedef regex_token_iterator&lt;&lt;std::wstring::const_iterator&gt; wsregex_token_iterator;
-#endif
-
-template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, std::size_t N&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-  <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const charT* p, 
-                            const basic_regex&lt;charT, traits&gt;&amp; e, 
-                            const int (&amp;submatch)[N], 
-                            regex_constants::match_flag_type m = regex_constants::match_default);
-                            
-template &lt;class charT, class traits, class ST, class SA, std::size_t N&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const int (&amp;submatch)[N], 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   <A href="#make_regex_token_iterator">make_regex_token_iterator</A>(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <H3><A name="description"></A>Description</H3>
-      <PRE><A name=c1></A>regex_token_iterator();</PRE>
-      <P><B> Effects:</B> constructs an end of sequence iterator.</P>
-      <PRE><A name=c2></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                     int submatch = 0, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
-         for the lifetime of the iterator constructed from it.</P>
-      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate one 
-         string for each regular expression match of the expression <EM>re</EM> found 
-         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; The 
-         string enumerated is the&nbsp;sub-expression <EM>submatch </EM>for each match 
-         found; if <EM>submatch </EM>is -1, then enumerates all the text sequences that 
-         did not match the expression <EM>re </EM>(that is to performs field splitting).</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <PRE><A name=c3></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                     const std::vector&lt;int&gt;&amp; submatches, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions:</B> <CODE>submatches.size() &amp;&amp; !re.empty()</CODE>.&nbsp; 
-         Object re shall exist for the lifetime of the iterator constructed from it.</P>
-      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate <EM>submatches.size()</EM>
-         strings for each regular expression match of the expression <EM>re</EM> found 
-         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; For 
-         each match found one string will be enumerated&nbsp;for each sub-expression 
-         index&nbsp;contained within <EM>submatches </EM>vector; if <EM>submatches[0] </EM>
-         is -1, then the first string enumerated for each match will be all of the text 
-         from end of the last match to the start of the current match, in addition there 
-         will be one extra string enumerated when no more matches can be found: from the 
-         end of the last match found, to the end of the underlying sequence.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <PRE><A name=c4></A>template &lt;std::size_t N&gt;
-regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
-                     const int (&amp;submatches)[R], match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
-         for the lifetime of the iterator constructed from it.</P>
-      <P><STRONG>Effects:</STRONG></B> constructs a regex_token_iterator that will 
-         enumerate&nbsp;<EM>R</EM> strings for each regular expression match of the 
-         expression <EM>re</EM> found within the sequence <EM>[a,b)</EM>, using match 
-         flags <EM>m</EM>.&nbsp; For each match found one string will be 
-         enumerated&nbsp;for each sub-expression index&nbsp;contained within the <EM>submatches
-         </EM>array; if <EM>submatches[0] </EM>is -1, then the first string enumerated 
-         for each match will be all of the text from end of the last match to the start 
-         of the current match, in addition there will be one extra string enumerated 
-         when no more matches can be found: from the end of the last match found, to the 
-         end of the underlying sequence.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <PRE><A name=c5></A>regex_token_iterator(const regex_token_iterator&amp; that);</PRE>
-      <P><B> Effects: </B>constructs a copy of <CODE>that</CODE>.</P>
-      <P><B> Postconditions:</B> <CODE>*this == that</CODE>.</P>
-      <PRE><A name=o1></A>regex_token_iterator&amp; operator=(const regex_token_iterator&amp; that);</PRE>
-      <P><B> Effects: </B>sets <CODE>*this</CODE> to be equal to&nbsp;<CODE>that</CODE>.</P>
-      <P><B> Postconditions:</B> <CODE>*this == that</CODE>.</P>
-      <PRE><A name=o2></A>bool operator==(const regex_token_iterator&amp;)const;</PRE>
-      <P>
-         <B>Effects: </B>returns true if *this is the same position as that.</P>
-      <PRE><A name=o3></A>bool operator!=(const regex_token_iterator&amp;)const;</PRE>
-      <P>
-         <B>Effects: </B>returns <CODE>!(*this == that)</CODE>.</P>
-      <PRE><A name=o4></A>const value_type&amp; operator*()const;</PRE>
-      <P>
-         <B>Effects: </B>returns the current character sequence being enumerated.</P>
-      <PRE><A name=o5></A>const value_type* operator-&gt;()const;</PRE>
-      <P>
-         <B>Effects: </B>returns <CODE>&amp;(*this)</CODE>.</P>
-      <PRE><A name=o6></A>regex_token_iterator&amp; operator++();</PRE>
-      <P>
-         <B>Effects: </B>Moves on to the next character sequence to be enumerated.</P>
-      <P><STRONG>Throws:</STRONG> <CODE>std::runtime_error</CODE> if the complexity of 
-         matching the expression against an N character string begins to exceed O(N<SUP>2</SUP>), 
-         or if the program runs out of stack space while matching the expression (if 
-         Boost.regex is <A href="configuration.html">configured</A> in recursive mode), 
-         or if the matcher exhausts it's permitted memory allocation (if Boost.regex is <A href="configuration.html">
-            configured</A> in non-recursive mode).</P>
-      <B>
-         <P>
-         Returns:</B><CODE> *this</CODE>.</P><PRE><A name=o7></A>regex_token_iterator&amp; operator++(int);</PRE>
-      <P><B> Effects:</B> constructs a copy <CODE>result</CODE> of <CODE>*this</CODE>, 
-         then calls <CODE>++(*this)</CODE>.</P>
-      <P><B> Returns:</B> <CODE>result</CODE>.<A name="examples"></A>
-         <PRE><A name=make_regex_token_iterator></A>template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   make_regex_token_iterator(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_token_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             int submatch = 0, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, std::size_t N&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-  make_regex_token_iterator(const charT* p, 
-                            const basic_regex&lt;charT, traits&gt;&amp; e, 
-                            const int (&amp;submatch)[N], 
-                            regex_constants::match_flag_type m = regex_constants::match_default);
-                            
-template &lt;class charT, class traits, class ST, class SA, std::size_t N&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_token_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const int (&amp;submatch)[N], 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits&gt;
-regex_token_iterator&lt;const charT*, charT, traits&gt; 
-   make_regex_token_iterator(const charT* p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-                             
-template &lt;class charT, class traits, class ST, class SA&gt;
-regex_token_iterator&lt;typename std::basic_string&lt;charT, ST, SA&gt;::const_iterator, charT, traits&gt; 
-   make_regex_token_iterator(const std::basic_string&lt;charT, ST, SA&gt;&amp; p, 
-                             const basic_regex&lt;charT, traits&gt;&amp; e, 
-                             const std::vector&lt;int&gt;&amp; submatch, 
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-</PRE>
-      <P>Effects: returns a <A href="#synopsis">regex_token_iterator</A> that enumerates 
-         one <A href="sub_match.html">sub_match</A> for each value in <EM>submatch</EM> for 
-         each occurrence of regular expression <EM>e</EM> in string <EM>p</EM>, matched 
-         using <A href="match_flag_type.html">match_flags</A> <EM>m</EM>.</P>
-      <P></P>
-      <H3>Examples</H3>
-      <P>The following <A href="../example/snippets/regex_token_iterator_eg_1.cpp">example</A>
-         takes a string and splits it into a series of tokens:</P>
-      <pre>
-<FONT color=#008040>#include &lt;iostream&gt;</FONT>
-<FONT color=#008040>#include &lt;boost/regex.hpp&gt;</FONT>
-
-<B>using</B> <B>namespace</B> std;
-
-<B>int</B> main(<B>int</B> argc)
-{
-   string s;
-   <B>do</B>{
-      <B>if</B>(argc == <FONT color=#0000a0>1</FONT>)
-      {
-         cout &lt;&lt; <FONT color=#0000ff>"Enter text to split (or \"quit\" to exit): "</FONT>;
-         getline(cin, s);
-         <B>if</B>(s == <FONT color=#0000ff>"quit"</FONT>) <B>break</B>;
-      }
-      <B>else</B>
-         s = <FONT color=#0000ff>"This is a string of tokens"</FONT>;
-
-      boost::regex re(<FONT color=#0000ff>"\\s+"</FONT>);
-      boost::sregex_token_iterator i(s.begin(), s.end(), re, -<FONT color=#0000a0>1</FONT>);
-      boost::sregex_token_iterator j;
-
-      <B>unsigned</B> count = <FONT color=#0000a0>0</FONT>;
-      <B>while</B>(i != j)
-      {
-         cout &lt;&lt; *i++ &lt;&lt; endl;
-         count++;
-      }
-      cout &lt;&lt; <FONT color=#0000ff>"There were "</FONT> &lt;&lt; count &lt;&lt; <FONT color=#0000ff>" tokens found."</FONT> &lt;&lt; endl;
-
-   }<B>while</B>(argc == <FONT color=#0000a0>1</FONT>);
-   <B>return</B> <FONT color=#0000a0>0</FONT>;
-}
-
-</pre>
-      <P>The following <A href="../example/snippets/regex_token_iterator_eg_2.cpp">example</A>
-         takes a html file and outputs a list of all the linked files:</P>
-      <pre>
-<FONT color=#008040>#include &lt;fstream&gt;</FONT>
-<FONT color=#008040>#include &lt;iostream&gt;</FONT>
-<FONT color=#008040>#include &lt;iterator&gt;</FONT>
-<FONT color=#008040>#include &lt;boost/regex.hpp&gt;</FONT>
-
-boost::regex e(<FONT color=#0000ff>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)\""</FONT>,
-               boost::regex::normal | boost::regbase::icase);
-
-<B>void</B> load_file(std::string&amp; s, std::istream&amp; is)
-{
-   s.erase();
-   <I><FONT color=#000080>//</FONT></I>
-   <I><FONT color=#000080>// attempt to grow string buffer to match file size,</FONT></I>
-   <I><FONT color=#000080>// this doesn't always work...</FONT></I>
-   s.reserve(is.rdbuf()-&gt;in_avail());
-   <B>char</B> c;
-   <B>while</B>(is.get(c))
-   {
-      <I><FONT color=#000080>// use logarithmic growth stategy, in case</FONT></I>
-      <I><FONT color=#000080>// in_avail (above) returned zero:</FONT></I>
-      <B>if</B>(s.capacity() == s.size())
-         s.reserve(s.capacity() * <FONT color=#0000a0>3</FONT>);
-      s.append(<FONT color=#0000a0>1</FONT>, c);
-   }
-}
-
-<B>int</B> main(<B>int</B> argc, <B>char</B>** argv)
-{
-   std::string s;
-   <B>int</B> i;
-   <B>for</B>(i = <FONT color=#0000a0>1</FONT>; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#0000ff>"Findings URL's in "</FONT> &lt;&lt; argv[i] &lt;&lt; <FONT color=#0000ff>":"</FONT> &lt;&lt; std::endl;
-      s.erase();
-      std::ifstream is(argv[i]);
-      load_file(s, is);
-      boost::sregex_token_iterator i(s.begin(), s.end(), e, <FONT color=#0000a0>1</FONT>);
-      boost::sregex_token_iterator j;
-      <B>while</B>(i != j)
-      {
-         std::cout &lt;&lt; *i++ &lt;&lt; std::endl;
-      }
-   }
-   <I><FONT color=#000080>//</FONT></I>
-   <I><FONT color=#000080>// alternative method:</FONT></I>
-   <I><FONT color=#000080>// test the array-literal constructor, and split out the whole</FONT></I>
-   <I><FONT color=#000080>// match as well as $1....</FONT></I>
-   <I><FONT color=#000080>//</FONT></I>
-   <B>for</B>(i = <FONT color=#0000a0>1</FONT>; i &lt; argc; ++i)
-   {
-      std::cout &lt;&lt; <FONT color=#0000ff>"Findings URL's in "</FONT> &lt;&lt; argv[i] &lt;&lt; <FONT color=#0000ff>":"</FONT> &lt;&lt; std::endl;
-      s.erase();
-      std::ifstream is(argv[i]);
-      load_file(s, is);
-      <B>const</B> <B>int</B> subs[] = {<FONT color=#0000a0>1</FONT>, <FONT color=#0000a0>0</FONT>,};
-      boost::sregex_token_iterator i(s.begin(), s.end(), e, subs);
-      boost::sregex_token_iterator j;
-      <B>while</B>(i != j)
-      {
-         std::cout &lt;&lt; *i++ &lt;&lt; std::endl;
-      }
-   }
-
-   <B>return</B> <FONT color=#0000a0>0</FONT>;
-}
-</pre>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         26 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/regex_token_iterator.qbk b/doc/regex_token_iterator.qbk
new file mode 100644
index 00000000..c975c5af
--- /dev/null
+++ b/doc/regex_token_iterator.qbk
@@ -0,0 +1,431 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_token_iterator regex_token_iterator]
+
+The template class [regex_token_iterator] is an iterator adapter; that is to 
+say it represents a new view of an existing iterator sequence, 
+by enumerating all the occurrences of a regular expression within that 
+sequence, and presenting one or more character sequence for each match found. 
+Each position enumerated by the iterator is a [sub_match] object that represents 
+what matched a particular sub-expression within the regular expression. 
+When class [regex_token_iterator] is used to enumerate a single sub-expression 
+with index -1, then the iterator performs field splitting: that is 
+to say it enumerates one character sequence for each section of the character 
+container sequence that does not match the regular expression specified.
+
+   template <class BidirectionalIterator, 
+            class charT = iterator_traits<BidirectionalIterator>::value_type,
+            class traits = regex_traits<charT> >
+   class regex_token_iterator 
+   {
+   public:
+      typedef          basic_regex<charT, traits>                              regex_type;
+      typedef          sub_match<BidirectionalIterator>                        value_type;
+      typedef typename iterator_traits<BidirectionalIterator>::difference_type difference_type;
+      typedef          const value_type*                                       pointer;
+      typedef          const value_type&                                       reference;
+      typedef          std::forward_iterator_tag                               iterator_category;
+      
+      ``[link boost_regex.regex_token_iterator.construct1 regex_token_iterator]``();
+      ``[link boost_regex.regex_token_iterator.construct2 regex_token_iterator]``(BidirectionalIterator a, 
+                           BidirectionalIterator b, 
+                           const regex_type& re, 
+                           int submatch = 0, 
+                           match_flag_type m = match_default);
+      ``[link boost_regex.regex_token_iterator.construct3 regex_token_iterator]``(BidirectionalIterator a, 
+                           BidirectionalIterator b, 
+                           const regex_type& re, 
+                           const std::vector<int>& submatches, 
+                           match_flag_type m = match_default);
+      template <std::size_t N>
+      ``[link boost_regex.regex_token_iterator.construct4 regex_token_iterator]``(BidirectionalIterator a, 
+                           BidirectionalIterator b, 
+                           const regex_type& re, 
+                           const int (&submatches)[N], 
+                           match_flag_type m = match_default);
+      ``[link boost_regex.regex_token_iterator.construct5 regex_token_iterator]``(const regex_token_iterator&);
+      regex_token_iterator& ``[link boost_regex.regex_token_iterator.assign operator=]``(const regex_token_iterator&);
+      bool ``[link boost_regex.regex_token_iterator.op_eq operator==]``(const regex_token_iterator&)const;
+      bool ``[link boost_regex.regex_token_iterator.op_ne operator!=]``(const regex_token_iterator&)const;
+      const value_type& ``[link boost_regex.regex_token_iterator.op_deref operator*]``()const;
+      const value_type* ``[link boost_regex.regex_token_iterator.op_arrow operator->]``()const;
+      regex_token_iterator& ``[link boost_regex.regex_token_iterator.op_inc1 operator++]``();
+      regex_token_iterator ``[link boost_regex.regex_token_iterator.op_inc2 operator++]``(int);
+   };
+
+   typedef regex_token_iterator<const char*>                   cregex_token_iterator;
+   typedef regex_token_iterator<std::string::const_iterator>   sregex_token_iterator;
+   #ifndef BOOST_NO_WREGEX
+   typedef regex_token_iterator<const wchar_t*>                wcregex_token_iterator;
+   typedef regex_token_iterator<<std::wstring::const_iterator> wsregex_token_iterator;
+   #endif
+
+   template <class charT, class traits>
+   regex_token_iterator<const charT*, charT, traits> 
+      ``[link boost_regex.regex_token_iterator.make make_regex_token_iterator]``(
+            const charT* p, 
+            const basic_regex<charT, traits>& e, 
+            int submatch = 0, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                
+   template <class charT, class traits, class ST, class SA>
+   regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+      ``[link boost_regex.regex_token_iterator.make make_regex_token_iterator]``(
+            const std::basic_string<charT, ST, SA>& p, 
+            const basic_regex<charT, traits>& e, 
+            int submatch = 0, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                
+   template <class charT, class traits, std::size_t N>
+   regex_token_iterator<const charT*, charT, traits> 
+   ``[link boost_regex.regex_token_iterator.make make_regex_token_iterator]``(
+            const charT* p, 
+            const basic_regex<charT, traits>& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                               
+   template <class charT, class traits, class ST, class SA, std::size_t N>
+   regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+      ``[link boost_regex.regex_token_iterator.make make_regex_token_iterator]``(
+            const std::basic_string<charT, ST, SA>& p, 
+            const basic_regex<charT, traits>& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                
+   template <class charT, class traits>
+   regex_token_iterator<const charT*, charT, traits> 
+      ``[link boost_regex.regex_token_iterator.make make_regex_token_iterator]``(
+            const charT* p, 
+            const basic_regex<charT, traits>& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                
+   template <class charT, class traits, class ST, class SA>
+   regex_token_iterator<
+         typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+      ``[link boost_regex.regex_token_iterator.make make_regex_token_iterator]``(
+            const std::basic_string<charT, ST, SA>& p, 
+            const basic_regex<charT, traits>& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+
+[h4 Description]
+
+[#boost_regex.regex_token_iterator.construct1]
+
+   regex_token_iterator();
+
+[*Effects]: constructs an end of sequence iterator.
+
+[#boost_regex.regex_token_iterator.construct2]
+
+   regex_token_iterator(BidirectionalIterator a, 
+                        BidirectionalIterator b, 
+                        const regex_type& re, 
+                        int submatch = 0, 
+                        match_flag_type m = match_default);
+
+[*Preconditions]: `!re.empty()`.  Object /re/ shall exist for the lifetime of 
+the iterator constructed from it.
+
+[*Effects]: constructs a [regex_token_iterator] that will enumerate one string for 
+each regular expression match of the expression /re/ found within the sequence \[a,b), 
+using match flags /m/ (see [match_flag_type]).  The string enumerated is the sub-expression /submatch/ 
+for each match found; if /submatch/ is -1, then enumerates all the text 
+sequences that did not match the expression /re/ (that is to performs field 
+splitting).
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression against 
+an N character string begins to exceed O(N[super 2]), or if the program runs 
+out of stack space while matching the expression (if Boost.Regex is configured 
+in recursive mode), or if the matcher exhausts its permitted memory 
+allocation (if Boost.Regex is configured in non-recursive mode).
+
+[#boost_regex.regex_token_iterator.construct3]
+
+   regex_token_iterator(BidirectionalIterator a, 
+                        BidirectionalIterator b, 
+                        const regex_type& re, 
+                        const std::vector<int>& submatches, 
+                        match_flag_type m = match_default);
+
+[*Preconditions]: `submatches.size() && !re.empty()`.  Object /re/ shall 
+exist for the lifetime of the iterator constructed from it.
+
+[*Effects]: constructs a [regex_token_iterator] that will enumerate 
+`submatches.size()` strings for each regular expression match of 
+the expression /re/ found within the sequence \[a,b), using match flags /m/ 
+(see [match_flag_type]).  For each match found one string will be enumerated 
+for each sub-expression index contained within submatches vector; if 
+`submatches[0]` is -1, then the first string enumerated for each match will be 
+all of the text from end of the last match to the start of the current match, 
+in addition there will be one extra string enumerated when no more matches can 
+be found: from the end of the last match found, to the end of the underlying sequence.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the 
+program runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted memory 
+allocation (if Boost.Regex is configured in non-recursive mode).
+
+[#boost_regex.regex_token_iterator.construct4]
+
+   template <std::size_t N>
+   regex_token_iterator(BidirectionalIterator a, 
+                        BidirectionalIterator b, 
+                        const regex_type& re, 
+                        const int (&submatches)[R], 
+                        match_flag_type m = match_default);
+
+[*Preconditions]: `!re.empty()`.  Object /re/ shall exist for the lifetime of the iterator constructed from it.
+
+[*Effects]: constructs a [regex_token_iterator] that will enumerate /R/ strings 
+for each regular expression match of the expression /re/ found within the sequence 
+\[a,b), using match flags /m/ (see [match_flag_type]).  For each match found one 
+string will be enumerated for each sub-expression index contained within the 
+/submatches/ array; if `submatches[0]` is -1, then the first string enumerated for 
+each match will be all of the text from end of the last match to the start 
+of the current match, in addition there will be one extra string enumerated when 
+no more matches can be found: from the end of the last match found, to 
+the end of the underlying sequence.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the 
+program runs out of stack space while matching the expression (if Boost.Regex 
+is configured in recursive mode), or if the matcher exhausts its 
+permitted memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[#boost_regex.regex_token_iterator.construct5]
+
+   regex_token_iterator(const regex_token_iterator& that);
+
+[*Effects]: constructs a copy of `that`.
+
+[*Postconditions]: `*this == that`.
+
+[#boost_regex.regex_token_iterator.assign]
+
+   regex_token_iterator& operator=(const regex_token_iterator& that);
+
+[*Effects]: sets `*this` to be equal to `that`.
+
+[*Postconditions]: `*this == that`.
+
+[#boost_regex.regex_token_iterator.op_eq]
+
+   bool operator==(const regex_token_iterator&)const;
+
+[*Effects]: returns true if `*this` is the same position as `that`.
+
+[#boost_regex.regex_token_iterator.op_ne]
+
+   bool operator!=(const regex_token_iterator&)const;
+
+[*Effects]: returns `!(*this == that)`.
+
+[#boost_regex.regex_token_iterator.op_deref]
+
+   const value_type& operator*()const;
+
+[*Effects]: returns the current character sequence being enumerated.
+
+[#boost_regex.regex_token_iterator.op_arrow]
+
+   const value_type* operator->()const;
+
+[*Effects]: returns `&(*this)`.
+
+[#boost_regex.regex_token_iterator.op_inc1]
+
+   regex_token_iterator& operator++();
+
+[*Effects]: Moves on to the next character sequence to be enumerated.
+
+[*Throws]: `std::runtime_error` if the complexity of matching the expression 
+against an N character string begins to exceed O(N[super 2]), or if the program 
+runs out of stack space while matching the expression (if Boost.Regex is 
+configured in recursive mode), or if the matcher exhausts its permitted 
+memory allocation (if Boost.Regex is configured in non-recursive mode).
+
+[*Returns]: `*this`.
+
+[#boost_regex.regex_token_iterator.op_inc2]
+
+   regex_token_iterator& operator++(int);
+
+[*Effects]: constructs a copy result of `*this`, then calls `++(*this)`.
+
+[*Returns]: result.
+
+[#boost_regex.regex_token_iterator.make]
+
+   template <class charT, class traits>
+   regex_token_iterator<const charT*, charT, traits> 
+      make_regex_token_iterator(
+            const charT* p, 
+            const basic_regex<charT, traits>& e, 
+            int submatch = 0, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                             
+   template <class charT, class traits, class ST, class SA>
+   regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+      make_regex_token_iterator(
+            const std::basic_string<charT, ST, SA>& p, 
+            const basic_regex<charT, traits>& e, 
+            int submatch = 0, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                
+   template <class charT, class traits, std::size_t N>
+   regex_token_iterator<const charT*, charT, traits> 
+   make_regex_token_iterator(
+            const charT* p, 
+            const basic_regex<charT, traits>& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                               
+   template <class charT, class traits, class ST, class SA, std::size_t N>
+   regex_token_iterator<
+         typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+      make_regex_token_iterator(
+            const std::basic_string<charT, ST, SA>& p, 
+            const basic_regex<charT, traits>& e, 
+            const int (&submatch)[N], 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                
+   template <class charT, class traits>
+   regex_token_iterator<const charT*, charT, traits> 
+      make_regex_token_iterator(
+            const charT* p, 
+            const basic_regex<charT, traits>& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+                                
+   template <class charT, class traits, class ST, class SA>
+   regex_token_iterator<
+         typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits> 
+      make_regex_token_iterator(
+            const std::basic_string<charT, ST, SA>& p, 
+            const basic_regex<charT, traits>& e, 
+            const std::vector<int>& submatch, 
+            regex_constants::match_flag_type m = regex_constants::match_default);
+
+[*Effects]: returns a [regex_token_iterator] that enumerates one [sub_match] 
+for each value in /submatch/ for each occurrence of regular expression /e/ 
+in string /p/, matched using [match_flag_type] /m/.
+
+[h4 Examples]
+
+The following example takes a string and splits it into a series of tokens:
+
+   #include <iostream>
+   #include <boost/regex.hpp>
+
+   using namespace std;
+
+   int main(int argc)
+   {
+      string s;
+      do{
+         if(argc == 1)
+         {
+            cout << "Enter text to split (or \"quit\" to exit): ";
+            getline(cin, s);
+            if(s == "quit") break;
+         }
+         else
+            s = "This is a string of tokens";
+
+         boost::regex re("\\s+");
+         boost::sregex_token_iterator i(s.begin(), s.end(), re, -1);
+         boost::sregex_token_iterator j;
+
+         unsigned count = 0;
+         while(i != j)
+         {
+            cout << *i++ << endl;
+            count++;
+         }
+         cout << "There were " << count << " tokens found." << endl;
+
+      }while(argc == 1);
+      return 0;
+   }
+
+
+The following example takes a html file and outputs a list of all the linked files:
+
+   #include <fstream>
+   #include <iostream>
+   #include <iterator>
+   #include <boost/regex.hpp>
+
+   boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
+                  boost::regex::normal | boost::regbase::icase);
+
+   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());
+      char c;
+      while(is.get(c))
+      {
+         // 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);
+      }
+   }
+
+   int main(int argc, char** argv)
+   {
+      std::string s;
+      int i;
+      for(i = 1; i < argc; ++i)
+      {
+         std::cout << "Findings URL's in " << argv[i] << ":" << std::endl;
+         s.erase();
+         std::ifstream is(argv[i]);
+         load_file(s, is);
+         boost::sregex_token_iterator i(s.begin(), s.end(), e, 1);
+         boost::sregex_token_iterator j;
+         while(i != j)
+         {
+            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)
+      {
+         std::cout << "Findings URL's in " << argv[i] << ":" << std::endl;
+         s.erase();
+         std::ifstream is(argv[i]);
+         load_file(s, is);
+         const int subs[] = {1, 0,};
+         boost::sregex_token_iterator i(s.begin(), s.end(), e, subs);
+         boost::sregex_token_iterator j;
+         while(i != j)
+         {
+            std::cout << *i++ << std::endl;
+         }
+      }
+
+      return 0;
+   }
+
+     
+[endsect]
+
diff --git a/doc/regex_traits.html b/doc/regex_traits.html
deleted file mode 100644
index dc1708f7..00000000
--- a/doc/regex_traits.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: class regex_traits</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">class regex_traits</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <pre>
-namespace boost{
-
-template &lt;class charT, class implementationT = sensible_default_choice&gt;
-struct regex_traits : public implementationT
-{
-   regex_traits() : implementationT() {}
-};
-
-template &lt;class charT&gt;
-struct c_regex_traits;
-
-template &lt;class charT&gt;
-struct cpp_regex_traits;
-
-template &lt;class charT&gt;
-struct w32_regex_traits;
-
-} // namespace boost
-</pre>
-      <H3><A name="description"></A>Description</H3>
-      <P>The class regex_traits is just a thin wrapper around an actual implemention 
-         class, which may be one of:</P>
-      <UL>
-         <LI>
-            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.</LI>
-         <LI>
-            cpp_regex_traits: the default traits class for non-Win32 platforms, allows the 
-            regex class to be imbued with a std::locale instance.</LI>
-         <LI>
-            w32_regex_traits: the default traits class implementation on Win32 platforms, 
-            allows the regex class to be imbued with an LCID.</LI></UL>
-      <P>The default behavior can be altered by defining one of the following 
-         configuration macros in <A href="../../../boost/regex/user.hpp">boost/regex/user.hpp</A>:</P>
-      <UL>
-         <LI>
-            BOOST_REGEX_USE_C_LOCALE: makes c_regex_traits the default.</LI>
-         <LI>
-            BOOST_REGEX_USE_CPP_LOCALE: makes cpp_regex_traits the default.</LI></UL>
-      <P>All these traits classes fulfil the <A href="concepts.html#traits">traits class 
-            requirements</A>.</P>
-      <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->
-            2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/regex_traits.qbk b/doc/regex_traits.qbk
new file mode 100644
index 00000000..08175dec
--- /dev/null
+++ b/doc/regex_traits.qbk
@@ -0,0 +1,50 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:regex_traits regex_traits]
+
+   namespace boost{
+
+   template <class charT, class implementationT = sensible_default_choice>
+   struct regex_traits : public implementationT
+   {
+      regex_traits() : implementationT() {}
+   };
+
+   template <class charT>
+   struct c_regex_traits;
+
+   template <class charT>
+   struct cpp_regex_traits;
+
+   template <class charT>
+   struct w32_regex_traits;
+
+   } // namespace boost
+
+[h4 Description]
+
+The class `regex_traits` is 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.
+
+The default behavior can be altered by defining one of the following 
+configuration macros in 
+[@../../../../boost/regex/user.hpp 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.
+
+All these traits classes fulfil the 
+[link boost_regex.ref.concepts.traits_concept traits class requirements].
+     
+[endsect]
+
diff --git a/doc/standards.html b/doc/standards.html
deleted file mode 100644
index d5bc8c46..00000000
--- a/doc/standards.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Standards Conformance</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Standards Conformance</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>C++</H3>
-      <P>Boost.regex is intended to conform to the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            regular expression standardization proposal</A>, which will appear in a 
-         future C++ standard technical report (and hopefully in a future version of the 
-         standard).&nbsp;</P>
-      <H3>ECMAScript / JavaScript</H3>
-      <P>All of the ECMAScript regular expression syntax features are supported, except 
-         that:</P>
-      <P>Negated class escapes (\S, \D and \W) are not permitted inside character class 
-         definitions ( [...] ).</P>
-      <P>The escape sequence \u matches any upper case character (the same as 
-         [[:upper:]])&nbsp;rather than a Unicode escape sequence; use \x{DDDD} for 
-         Unicode escape sequences.</P>
-      <H3>Perl</H3>
-      <P>Almost all Perl features are supported, except for:</P>
-      <P>
-         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD>(?{code})</TD>
-               <TD>Not implementable in a compiled strongly typed language.</TD>
-            </TR>
-            <TR>
-               <TD>(??{code})</TD>
-               <TD>Not implementable in a compiled strongly typed language.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>POSIX</H3>
-      <P>All the POSIX basic and extended regular expression features are supported, 
-         except that:</P>
-      <P>No character collating names are recognized except those specified in the POSIX 
-         standard for the C locale, unless they are explicitly registered with the 
-         traits class.</P>
-      <P>Character equivalence classes ( [[=a=]] etc) are probably buggy except on 
-         Win32.&nbsp; Implementing this feature requires knowledge of the format of the 
-         string sort keys produced by the system; if you need this, and the default 
-         implementation doesn't work on your platform, then you will need to supply a 
-         custom traits class.</P>
-      <H3>Unicode</H3>
-      <P>The following comments refer to&nbsp;<A href="http://www.unicode.org/reports/tr18/">Unicode 
-            Technical
-            <SPAN>Standard 
-</SPAN>#18: Unicode Regular Expressions</A>&nbsp;version 9.</P>
-      <P>
-         <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD>#</TD>
-               <TD>Feature</TD>
-               <TD>Support</TD>
-            </TR>
-            <TR>
-               <TD>1.1</TD>
-               <TD>Hex Notation</TD>
-               <TD>Yes: use \x{DDDD} to refer to code point UDDDD.</TD>
-            </TR>
-            <TR>
-               <TD>1.2</TD>
-               <TD>Character Properties</TD>
-               <TD>All the names listed under the&nbsp;<A href="http://www.unicode.org/reports/tr18/#Categories">General 
-                     Category Property</A> are supported.&nbsp; Script names and Other Names are 
-                  not currently supported.</TD>
-            </TR>
-            <TR>
-               <TD>1.3</TD>
-               <TD><A name="Subtraction_and_Intersection">Subtraction</A> and Intersection</TD>
-               <TD>
-                  <P>Indirectly support by forward-lookahead:
-                  </P>
-                  <P>(?=[[:X:]])[[:Y:]]</P>
-                  <P>Gives the intersection of character properties X and Y.</P>
-                  <P>(?![[:X:]])[[:Y:]]</P>
-                  <P>Gives everything in Y that is not in X (subtraction).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>1.4</TD>
-               <TD><A name="Simple_Word_Boundaries">Simple Word Boundaries</A></TD>
-               <TD>Conforming: non-spacing marks are included in the set of word characters.</TD>
-            </TR>
-            <TR>
-               <TD>1.5</TD>
-               <TD>Caseless Matching</TD>
-               <TD>Supported, note that at this level, case transformations are 1:1, many to many 
-                  case folding operations are not supported (for example&nbsp;"ß" to "SS").</TD>
-            </TR>
-            <TR>
-               <TD>1.6</TD>
-               <TD>Line Boundaries</TD>
-               <TD>Supported, except that "." matches only one character of "\r\n". Other than 
-                  that word boundaries match correctly; including not matching in the middle of a 
-                  "\r\n" sequence.</TD>
-            </TR>
-            <TR>
-               <TD>1.7</TD>
-               <TD>Code Points</TD>
-               <TD>Supported: provided you use the <A href="icu_strings.html">u32* algorithms</A>, 
-                  then UTF-8, UTF-16 and UTF-32 are all treated as sequences of 32-bit code 
-                  points.</TD>
-            </TR>
-            <TR>
-               <TD>2.1</TD>
-               <TD>Canonical Equivalence</TD>
-               <TD>Not supported: it is up to the user of the library to convert all text into 
-                  the same canonical form as the regular expression.</TD>
-            </TR>
-            <TR>
-               <TD>2.2</TD>
-               <TD>Default Grapheme Clusters</TD>
-               <TD>Not supported.</TD>
-            </TR>
-            <TR>
-               <TD>2.3</TD>
-               <TD><!--StartFragment -->
-                  <P><A name="Default_Word_Boundaries">Default Word Boundaries</A></P>
-               </TD>
-               <TD>Not supported.</TD>
-            </TR>
-            <TR>
-               <TD>2.4</TD>
-               <TD><!--StartFragment -->
-                  <P><A name="Default_Loose_Matches">Default Loose Matches</A></P>
-               </TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>2.5</TD>
-               <TD>Name Properties</TD>
-               <TD>Supported: the expression "[[:name:]]" or \N{name} matches the named character 
-                  "name".</TD>
-            </TR>
-            <TR>
-               <TD>2.6</TD>
-               <TD>Wildcard properties</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.1</TD>
-               <TD>Tailored Punctuation.</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.2</TD>
-               <TD>Tailored Grapheme Clusters</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.3</TD>
-               <TD>Tailored Word Boundaries.</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.4</TD>
-               <TD>Tailored Loose Matches</TD>
-               <TD>Partial support: [[=c=]] matches characters with the same primary equivalence 
-                  class as "c".</TD>
-            </TR>
-            <TR>
-               <TD>3.5</TD>
-               <TD>Tailored Ranges</TD>
-               <TD>Supported: [a-b] matches any character that collates in the range a to b, when 
-                  the expression is constructed with the <A href="syntax_option_type.html">collate</A>
-                  flag set.</TD>
-            </TR>
-            <TR>
-               <TD>3.6</TD>
-               <TD>Context Matches</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.7</TD>
-               <TD>Incremental Matches</TD>
-               <TD>Supported: pass the flag <A href="match_flag_type.html">match_partial</A> to 
-                  the regex algorithms.</TD>
-            </TR>
-            <TR>
-               <TD>3.8</TD>
-               <TD>Unicode Set Sharing</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-            <TR>
-               <TD>3.9</TD>
-               <TD>Possible Match Sets</TD>
-               <TD>Not supported, however this information is used internally to optimise the 
-                  matching of regular expressions, and return quickly if no match is possible.</TD>
-            </TR>
-            <TR>
-               <TD>3.10</TD>
-               <TD>Folded Matching</TD>
-               <TD>Partial Support:&nbsp; It is possible to achieve a similar effect by using a 
-                  custom regular expression traits class.</TD>
-            </TR>
-            <TR>
-               <TD>3.11</TD>
-               <TD>Custom&nbsp;Submatch Evaluation</TD>
-               <TD>Not Supported.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         28 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
-
diff --git a/doc/standards.qbk b/doc/standards.qbk
new file mode 100644
index 00000000..8467e52a
--- /dev/null
+++ b/doc/standards.qbk
@@ -0,0 +1,87 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:standards Standards Conformance]
+
+[h4 C++]
+
+Boost.Regex is intended to conform to the [tr1].
+
+[h4 ECMAScript / JavaScript]
+
+All of the ECMAScript regular expression syntax features are supported, except that:
+
+The escape sequence \\u matches any upper case character (the same as \[\[:upper:\]\]) 
+rather than a Unicode escape sequence; use \\x{DDDD} for Unicode escape sequences.
+
+[h4 Perl]
+
+Almost all Perl features are supported, except for:
+
+(?{code}) 	Not implementable in a compiled strongly typed language.
+
+(??{code}) 	Not implementable in a compiled strongly typed language.
+
+[h4 POSIX]
+
+All the POSIX basic and extended regular expression features are supported, 
+except that:
+
+No character collating names are recognized except those specified in the 
+POSIX standard for the C locale, unless they are explicitly registered with the 
+traits class.
+
+Character equivalence classes ( \[\[\=a\=\]\] etc) are probably buggy except on Win32.  
+Implementing this feature requires knowledge of the format of the string sort 
+keys produced by the system; if you need this, and the default implementation 
+doesn't work on your platform, then you will need to supply a custom traits class.
+
+[h4 Unicode]
+
+The following comments refer to 
+[@http://unicode.org/reports/tr18/ Unicode Technical Standard #18: Unicode 
+Regular Expressions version 11].
+
+[table
+[[Item][Feature][Support]]
+[[1.1][Hex Notation][Yes: use \x{DDDD} to refer to code point UDDDD.]]
+[[1.2][Character Properties][All the names listed under the General Category Property are supported.  Script names and Other Names are not currently supported.]]
+[[1.3][Subtraction and Intersection][Indirectly support by forward-lookahead:
+
+`(?=[[:X:]])[[:Y:]]`
+
+Gives the intersection of character properties X and Y.
+
+`(?![[:X:]])[[:Y:]]`
+
+Gives everything in Y that is not in X (subtraction).]]
+[[1.4][Simple Word Boundaries][Conforming: non-spacing marks are included in the set of word characters.]]
+[[1.5][Caseless Matching][Supported, note that at this level, case transformations are 1:1, many to many case folding operations are not supported (for example "'''&#xDF;'''" to "SS").]]
+[[1.6][Line Boundaries][Supported, except that "." matches only one character of "\\r\\n". Other than that word boundaries match correctly; including not matching in the middle of a "\\r\\n" sequence.]]
+[[1.7][Code Points][Supported: provided you use the u32* algorithms, then UTF-8, UTF-16 and UTF-32 are all treated as sequences of 32-bit code points.]]
+[[2.1][Canonical Equivalence][Not supported: it is up to the user of the library to convert all text into the same canonical form as the regular expression.]]
+[[2.2][Default Grapheme Clusters][Not supported.]]
+[[2.3Default Word Boundaries][Not supported.]]
+[[2.4][Default Loose Matches][Not Supported.]]
+[[2.5][Named Properties][Supported: the expression "\[\[:name:\]\]" or \\N{name} matches the named character "name".]]
+[[2.6][Wildcard properties][Not Supported.]]
+[[3.1][Tailored Punctuation.][Not Supported.]]
+[[3.2][Tailored Grapheme Clusters][Not Supported.]]
+[[3.3][Tailored Word Boundaries.][Not Supported.]]
+[[3.4][Tailored Loose Matches][Partial support: \[\[\=c\=\]\] matches characters with the same primary equivalence class as "c".]]
+[[3.5][Tailored Ranges][Supported: \[a-b\] matches any character that collates in the range a to b, when the expression is constructed with the collate flag set.]]
+[[3.6][Context Matches][Not Supported.]]
+[[3.7][Incremental Matches][Supported: pass the flag `match_partial` to the regex algorithms.]]
+[[3.8][Unicode Set Sharing][Not Supported.]]
+[[3.9][Possible Match Sets][Not supported, however this information is used internally to optimise the matching of regular expressions, and return quickly if no match is possible.]]
+[[3.10][Folded Matching][Partial Support:  It is possible to achieve a similar effect by using a custom regular expression traits class.]]
+[[3.11][Custom Submatch Evaluation][Not Supported.]]
+]
+     
+[endsect]
+
diff --git a/doc/sub_match.html b/doc/sub_match.html
deleted file mode 100644
index 388d6773..00000000
--- a/doc/sub_match.html
+++ /dev/null
@@ -1,571 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: sub_match</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">sub_match</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Synopsis</H3>
-      <P>#include &lt;<A href="../../../boost/regex.hpp">boost/regex.hpp</A>&gt;
-      </P>
-      <P>Regular expressions are different from many simple pattern-matching algorithms 
-         in that as well as finding an overall match they can also produce 
-         sub-expression matches: each sub-expression being delimited in the pattern by a 
-         pair of parenthesis (...). There has to be some method for reporting 
-         sub-expression matches back to the user: this is achieved this by defining a 
-         class <I><A href="match_results.html">match_results</A></I> that acts as an 
-         indexed collection of sub-expression matches, each sub-expression match being 
-         contained in an object of type <I>sub_match</I>
-      .
-      <P>Objects of type <EM>sub_match</EM> may only obtained by subscripting an object 
-         of type <EM><A href="match_results.html">match_results</A></EM>
-      .
-      <P>Objects of type <EM>sub_match</EM> may be compared to objects of type <EM>std::basic_string</EM>, 
-         or <EM>const charT*</EM> or <EM>const charT</EM>
-      .
-      <P>Objects of type <EM>sub_match</EM> may be added to objects of type <EM>std::basic_string</EM>, 
-         or <EM>const charT* </EM>or <EM>const charT</EM>, to produce a new <EM>std::basic_string
-         </EM>
-      object.
-      <P>When the marked sub-expression denoted by an object of type sub_match&lt;&gt; 
-         participated in a regular expression match then member <CODE>matched</CODE> evaluates 
-         to true, and members <CODE>first</CODE> and <CODE>second</CODE> denote the 
-         range of characters <CODE>[first,second)</CODE> which formed that match. 
-         Otherwise <CODE>matched</CODE> is false, and members <CODE>first</CODE> and <CODE>second</CODE>
-         contained undefined values.</P>
-      <P>When the marked sub-expression denoted by an object of type sub_match&lt;&gt; 
-         was repeated, then the sub_match object represents the match obtained by the 
-         last repeat.&nbsp; The complete set of all the captures obtained for all the 
-         repeats, may be accessed via the captures() member function (Note: this has 
-         serious performance implications, you have to explicitly enable this feature).</P>
-      <P>If an object of type <CODE>sub_match&lt;&gt;</CODE> represents sub-expression 0 
-         - that is to say the whole match - then member <CODE>matched</CODE> is always 
-         true, unless a partial match was obtained as a result of the flag <CODE>match_partial</CODE>
-         being passed to a regular expression algorithm, in which case member <CODE>matched</CODE>
-         is false, and members <CODE>first</CODE> and <CODE>second</CODE> represent the 
-         character range that formed the partial match.</P>
-      <PRE>namespace boost{
-
-template &lt;class BidirectionalIterator&gt;
-class sub_match;
-
-typedef sub_match&lt;const char*&gt; csub_match;
-typedef sub_match&lt;const wchar_t*&gt; wcsub_match;
-typedef sub_match&lt;std::string::const_iterator&gt; ssub_match;
-typedef sub_match&lt;std::wstring::const_iterator&gt; wssub_match;
-
-template &lt;class BidirectionalIterator&gt;
-class sub_match : public std::pair&lt;BidirectionalIterator, BidirectionalIterator&gt;
-{
-public:
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::value_type       value_type;
-   typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type  difference_type;
-   typedef          BidirectionalIterator                                    iterator;
-
-   bool <A href="#m1" >matched</A>;
-
-   difference_type <A href="#m2" >length</A>()const;
-   operator <A href="#m3" >basic_string</A>&lt;value_type&gt;()const;
-   basic_string&lt;value_type&gt; <A href="#m4" >str</A>()const;
-
-   int <A href="#m5" >compare</A>(const sub_match&amp; s)const;
-   int <A href="#m6" >compare</A>(const basic_string&lt;value_type&gt;&amp; s)const;
-   int <A href="#m7" >compare</A>(const value_type* s)const;
-#ifdef BOOST_REGEX_MATCH_EXTRA
-   typedef implementation-private <A href="#m9">capture_sequence_type</A>;
-   const capture_sequence_type&amp; <A href="#m8" >captures</A>()const;
-#endif
-};
-//
-// comparisons to another sub_match:
-//
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o11" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o12" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o13" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o14" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o15" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator&gt;
-bool <A href="#o16" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-
-
-//
-// comparisons to a basic_string:
-//
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o21" >operator</A> == (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o22" >operator</A> != (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o23" >operator</A> &lt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o24" >operator</A> &gt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o25" >operator</A> &gt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o26" >operator</A> &lt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o31" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o32" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o33" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o34" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o35" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool <A href="#o36" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);
-
-//
-// comparisons to a pointer to a character array:
-//
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o41" >operator</A> == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o42" >operator</A> != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o43" >operator</A> &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o44" >operator</A> &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o45" >operator</A> &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o46" >operator</A> &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o51" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o52" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o53" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o54" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o55" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o56" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); 
-
-//
-// comparisons to a single character:
-//
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o61" >operator</A> == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o62" >operator</A> != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o63" >operator</A> &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o64" >operator</A> &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o65" >operator</A> &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o66" >operator</A> &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); 
-
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o71" >operator</A> == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o72" >operator</A> != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o73" >operator</A> &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o74" >operator</A> &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o75" >operator</A> &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-template &lt;class BidirectionalIterator&gt; 
-bool <A href="#o76" >operator</A> &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); 
-// 
-// addition operators: 
-//
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt; 
-    <A href="#o81" >operator</A> + (const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); 
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;
-    <A href="#o82" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s); 
-template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o83" >operator</A> + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); 
-template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o84" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const * s);
-template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o85" >operator</A> + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); 
-template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o86" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s); 
-template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    <A href="#o87" >operator</A> + (const sub_match&lt;BidirectionalIterator&gt;&amp; m1,
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m2);
-
-//
-// stream inserter:
-//
-template &lt;class charT, class traits, class BidirectionalIterator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   <A href="#oi" >operator</A> &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os,
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m);
-
-} // namespace boost</PRE>
-      <H3>Description</H3>
-      <H4>sub_match members</H4>
-      <PRE>typedef typename std::iterator_traits&lt;iterator&gt;::value_type value_type;</PRE>
-      <P>The type pointed to by the iterators.</P>
-      <PRE>typedef typename std::iterator_traits&lt;iterator&gt;::difference_type difference_type;</PRE>
-      <P>A type that represents the difference between two iterators.</P>
-      <PRE>typedef iterator iterator_type;</PRE>
-      <P>The iterator type.</P>
-      <PRE>iterator first</PRE>
-      <P>An iterator denoting the position of the start of the match.</P>
-      <PRE>iterator second</PRE>
-      <P>An iterator denoting the position of the end of the match.</P>
-      <PRE><A name=m1></A>bool matched</PRE>
-      <P>A Boolean value denoting whether this sub-expression participated in the match.</P>
-      <PRE><A name=m2></A>static difference_type length();</PRE>
-      <P><B>Effects: </B>returns the length of this matched sub-expression, or 0 if this 
-         sub-expression was not matched: <CODE>matched ? distance(first, second) : 0)</CODE>.</P>
-      <PRE><A name=m3></A>operator basic_string&lt;value_type&gt;()const;</PRE>
-      <P><B>Effects: </B>converts *this into a string: returns <CODE>(matched ? 
-         basic_string&lt;value_type&gt;(first, second) : 
-         basic_string&lt;value_type&gt;()).</P>
-      </CODE><PRE><A name=m4></A>basic_string&lt;value_type&gt; str()const;</PRE>
-      <P><B>Effects: </B>returns a string representation of *this:&nbsp; <CODE>(matched ? 
-            basic_string&lt;value_type&gt;(first, second) : 
-            basic_string&lt;value_type&gt;())</CODE>.</P>
-      <PRE><A name=m5></A>int compare(const sub_match&amp; s)const;</PRE>
-      <P><B>Effects: </B>performs a lexical comparison to <EM>s</EM>: returns <CODE>str().compare(s.str())</CODE>.</P>
-      <PRE><A name=m6></A>int compare(const basic_string&lt;value_type&gt;&amp; s)const;</PRE>
-      <P><B>Effects: </B>compares *this to the string s: returns <CODE>str().compare(s)</CODE>.</P>
-      <PRE><A name=m7></A>int compare(const value_type* s)const;</PRE>
-      <P><B>Effects:<B></B> </B>compares *this to the null-terminated string <EM>s</EM>:<B>&nbsp;</B>returns
-         <CODE>str().compare(s)</CODE>.</P>
-      <PRE><A name=m9></A>typedef implementation-private capture_sequence_type;</PRE>
-      <P>Defines an implementation-specific type that&nbsp;satisfies the requirements of 
-         a standard library Sequence (21.1.1 including the optional Table 68 
-         operations),&nbsp;whose value_type is a <EM>sub_match&lt;BidirectionalIterator&gt;</EM>.&nbsp;This 
-         type happens to be <EM>std::vector&lt;sub_match&lt;BidirectionalIterator&gt; &gt;</EM>, 
-         but you shouldn't actually rely on that.</P>
-      <PRE><A name=m8></A>const capture_sequence_type&amp; <A href="#m8" >captures</A>()const; </PRE>
-      <P><STRONG>Effects:</STRONG> returns a sequence containing all the captures 
-         obtained for this sub-expression.</P>
-      <P><STRONG>Preconditions:</STRONG> the library must be built and used with 
-         BOOST_REGEX_MATCH_EXTRA defined, and you must pass the flag <A href="match_flag_type.html">
-            match_extra</A> to the regex matching functions (<A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, <A href="regex_iterator.html">regex_iterator</A>
-         or <A href="regex_token_iterator.html">regex_token_iterator</A>) in order for 
-         this member function to be defined and return useful information.</P>
-      <P><STRONG>Rationale:</STRONG> Enabling this feature has several consequences:
-      </P>
-      <UL>
-         <LI>
-         sub_match occupies more memory resulting in complex expressions running out of 
-         memory or stack space more quickly during matching.
-         <LI>
-            The matching algorithms are less efficient at handling some features 
-            (independent sub-expressions for example), even when <EM>match_extra</EM>
-         is not used.
-         <LI>
-            The matching algorithms are much less efficient (i.e. slower), when <EM>match_extra</EM>
-            is used.&nbsp; Mostly this is down to the extra memory allocations that have to 
-            take place.</LI></UL>
-      <H4>sub_match non-member operators</H4>
-      <H5>Comparisons against self</H5>
-      <PRE><A name=o11></A>template &lt;class BidirectionalIterator&gt;
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) == 0</CODE>.</P>
-      <PRE><A name=o12></A>template &lt;class BidirectionalIterator&gt;
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) != 0</CODE>.</P>
-      <PRE><A name=o13></A>template &lt;class BidirectionalIterator&gt;
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &lt; 0</CODE>.</P>
-      <PRE><A name=o14></A>template &lt;class BidirectionalIterator&gt;
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &lt;= 0</CODE>.</P>
-      <PRE><A name=o15></A>template &lt;class BidirectionalIterator&gt;
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &gt;= 0</CODE>.</P>
-      <PRE><A name=o16></A>template &lt;class BidirectionalIterator&gt;
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.compare(rhs) &gt; 0</CODE>.</P>
-      <H5>Comparisons with std::basic_string</H5>
-      <pre><A name=o21></A>
-template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator == (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits,
-                  Allocator&gt;&amp; lhs, const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);
-</pre>
-      <P><B>Effects: </B>returns <CODE>lhs == rhs.str()</CODE>.</P>
-      <PRE><A name=o22></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator != (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs != rhs.str()</CODE>.</P>
-      <PRE><A name=o23></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs&nbsp;&lt; rhs.str()</CODE>.</P>
-      <PRE><A name=o24></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt; (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs&nbsp;&gt; rhs.str()</CODE>.</P>
-      <PRE><A name=o25></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o26></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt;= (const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; lhs,
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o31></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() == rhs</CODE>.</P>
-      <PRE><A name=o32></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() != rhs</CODE>.</P>
-      <PRE><A name=o33></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str()&nbsp;&lt; rhs</CODE>.</P>
-      <PRE><A name=o34></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                 const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str()&nbsp;&gt; rhs</CODE>.</P>
-      <PRE><A name=o35></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt;= rhs</CODE>.</P>
-      <PRE><A name=o36></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs,
-                  const std::basic_string&lt;iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; rhs);</PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt;= rhs</CODE>.</P>
-      <H5>Comparisons with null-terminated strings</H5>
-      <PRE><A name=o41></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs == rhs.str()</CODE>.</P>
-      <PRE><A name=o42></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs != rhs.str()</CODE>.</P>
-      <PRE></A><A name=o43></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt; rhs.str()</CODE>.</P>
-      <PRE><A name=o44></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt; rhs.str()</CODE>.</P>
-      <PRE><A name=o45></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o46></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o51></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() == rhs</CODE>.</P>
-      <PRE><A name=o52></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() != rhs</CODE>.</P>
-      <PRE><A name=o53></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt; rhs</CODE>.</P>
-      <PRE><A name=o54></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt; rhs</CODE>.</P>
-      <PRE><A name=o55></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt;= rhs</CODE>.</P>
-      <PRE><A name=o56></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt;= rhs</CODE>.</P>
-      <H5>Comparisons with a single character</H5>
-      <PRE><A name=o61></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs == rhs.str()</CODE>.</P>
-      <PRE><A name=o62></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs != rhs.str()</CODE>.</P>
-      <PRE><A name=o63></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt; rhs.str()</CODE>.</P>
-      <PRE><A name=o64></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                 const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt; rhs.str()</CODE>.</P>
-      <PRE><A name=o65></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &gt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o66></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; lhs, 
-                  const sub_match&lt;BidirectionalIterator&gt;&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs &lt;= rhs.str()</CODE>.</P>
-      <PRE><A name=o71></A>template &lt;class BidirectionalIterator&gt; 
-bool operator == (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() == rhs</CODE>.</P>
-      <PRE><A name=o72></A>template &lt;class BidirectionalIterator&gt; 
-bool operator != (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() != rhs</CODE>.</P>
-      <PRE><A name=o73></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt; rhs</CODE>.</P>
-      <PRE><A name=o74></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt; (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                 typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt; rhs</CODE>.</P>
-      <PRE><A name=o75></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &gt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &gt;= rhs</CODE>.</P>
-      <PRE><A name=o76></A>template &lt;class BidirectionalIterator&gt; 
-bool operator &lt;= (const sub_match&lt;BidirectionalIterator&gt;&amp; lhs, 
-                  typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; rhs); </PRE>
-      <P><B>Effects: </B>returns <CODE>lhs.str() &lt;= rhs</CODE>.</P>
-      <h5>Addition operators</h5>
-      <P>The addition operators for sub_match allow you to add a sub_match to any type 
-         to which you can add a std::string and obtain a new string as the result.</P>
-      <PRE><A name=o81></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt; 
-    operator + (const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); </PRE>
-      <P><B>Effects: </B>returns <CODE>s + m.str()</CODE>.</P>
-      <PRE><A name=o82></A>template &lt;class BidirectionalIterator, class traits, class Allocator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                const std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type, traits, Allocator&gt;&amp; s); </PRE>
-      <P><B>Effects: </B>returns <CODE>m.str() + s</CODE>.</P>
-      <PRE><A name=o83></A>template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const* s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); </PRE>
-      <P><B>Effects: </B>returns <CODE>s + m.str()</CODE>.</P>
-      <PRE><A name=o84></A>template &lt;class BidirectionalIterator&gt; std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const * s);</PRE>
-      <P><B>Effects: </B>returns <CODE>m.str() + s</CODE>.</P>
-      <PRE><A name=o85></A>template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s, 
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m); </PRE>
-      <P><B>Effects: </B>returns <CODE>s + m.str()</CODE>.</P>
-      <PRE><A name=o86></A>template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m, 
-                typename iterator_traits&lt;BidirectionalIterator&gt;::value_type const&amp; s); </PRE>
-      <P><B>Effects: </B>returns <CODE>m.str() + s</CODE>.</P>
-      <PRE><A name=o87></A>template &lt;class BidirectionalIterator&gt; 
-std::basic_string&lt;typename iterator_traits&lt;BidirectionalIterator&gt;::value_type&gt; 
-    operator + (const sub_match&lt;BidirectionalIterator&gt;&amp; m1,
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m2);</PRE>
-      <P><B>Effects: </B>returns&nbsp;<CODE>m1.str() + m2.str()</CODE>.</P>
-      <h5>Stream inserter</h5>
-      <PRE><A name=oi></A>template &lt;class charT, class traits, class BidirectionalIterator&gt;
-basic_ostream&lt;charT, traits&gt;&amp;
-   operator &lt;&lt; (basic_ostream&lt;charT, traits&gt;&amp; os
-                const sub_match&lt;BidirectionalIterator&gt;&amp; m);</PRE>
-      <P>
-         <B>Effects: </B>returns <CODE>(os &lt;&lt; m.str())</CODE>.
-         <HR>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         22&nbsp;Dec 2004 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2004</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/sub_match.qbk b/doc/sub_match.qbk
new file mode 100644
index 00000000..653c0f37
--- /dev/null
+++ b/doc/sub_match.qbk
@@ -0,0 +1,850 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:sub_match sub_match]
+
+   #include <boost/regex.hpp>
+
+Regular expressions are different from many simple pattern-matching algorithms in 
+that as well as finding an overall match they can also produce sub-expression 
+matches: each sub-expression being delimited in the pattern by a pair of 
+parenthesis (...). There has to be some method for reporting sub-expression 
+matches back to the user: this is achieved this by defining a class 
+[match_results] that acts as an indexed collection of sub-expression matches, 
+each sub-expression match being contained in an object of type [sub_match].
+
+Objects of type [sub_match] may only be obtained by subscripting an object of 
+type [match_results].
+
+Objects of type [sub_match] may be compared to objects of type `std::basic_string`, 
+or `const charT*` or `const charT`.
+
+Objects of type [sub_match] may be added to objects of type `std::basic_string`, or 
+`const charT*` or `const charT`, to produce a new `std::basic_string` object.
+
+When the marked sub-expression denoted by an object of type [sub_match] 
+participated in a regular expression match then member /matched/ evaluates 
+to /true/, and members /first/ and /second/ denote the range of characters 
+\[first,second) which formed that match. Otherwise /matched/ is /false/, and 
+members /first/ and /second/ contained undefined values.
+
+When the marked sub-expression denoted by an object of type 
+[sub_match] was repeated, then the [sub_match] object represents 
+the match obtained by the /last/ repeat.  The complete set of all the 
+captures obtained for all the repeats, may be accessed via the 
+captures() member function (Note: this has serious performance implications, 
+you have to explicitly enable this feature).
+
+If an object of type [sub_match] represents sub-expression 0 - that is to 
+say the whole match - then member /matched/ is always /true/, unless a 
+[link boost_regex.partial_matches partial match] was obtained as a result of the flag 
+`match_partial` being passed to a regular expression algorithm, in which 
+case member /matched/ is /false/, and members /first/ and /second/ represent 
+the character range that formed the partial match.
+
+   namespace boost{
+
+   template <class BidirectionalIterator>
+   class sub_match;
+
+   typedef sub_match<const char*>                    csub_match;
+   typedef sub_match<const wchar_t*>                 wcsub_match;
+   typedef sub_match<std::string::const_iterator>    ssub_match;
+   typedef sub_match<std::wstring::const_iterator>   wssub_match;
+
+   template <class BidirectionalIterator>
+   class sub_match : public std::pair<BidirectionalIterator, BidirectionalIterator>
+   {
+   public:
+      typedef typename iterator_traits<BidirectionalIterator>::value_type       ``[link boost_regex.sub_match.value_type value_type]``;
+      typedef typename iterator_traits<BidirectionalIterator>::difference_type  ``[link boost_regex.sub_match.diff_type difference_type]``;
+      typedef          BidirectionalIterator                                    ``[link boost_regex.sub_match.it_type iterator]``;
+
+      bool ``[link boost_regex.sub_match.matched matched]``;
+
+      difference_type ``[link boost_regex.sub_match.length length]``()const;
+      ``[link boost_regex.sub_match.cast operator basic_string<value_type>]``()const;
+      basic_string<value_type> ``[link boost_regex.sub_match.str str]``()const;
+
+      int ``[link boost_regex.sub_match.compare1 compare]``(const sub_match& s)const;
+      int ``[link boost_regex.sub_match.compare2 compare]``(const basic_string<value_type>& s)const;
+      int ``[link boost_regex.sub_match.compare3 compare]``(const value_type* s)const;
+   #ifdef BOOST_REGEX_MATCH_EXTRA
+      typedef implementation-private ``[link boost_regex.sub_match.cap_seq_type capture_sequence_type]``;
+      const capture_sequence_type& ``[link boost_regex.sub_match.captures captures]``()const;
+   #endif
+   };
+   //
+   // comparisons to another sub_match:
+   //
+   template <class BidirectionalIterator>
+   bool ``[link boost_regex.sub_match.op_compare1 operator ==]`` (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator>
+   bool ``[link boost_regex.sub_match.op_compare2 operator !=]`` (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator>
+   bool ``[link boost_regex.sub_match.op_compare3 operator <]`` (const sub_match<BidirectionalIterator>& lhs,
+                  const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator>
+   bool ``[link boost_regex.sub_match.op_compare4 operator <=]`` (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator>
+   bool ``[link boost_regex.sub_match.op_compare5 operator >=]`` (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator>
+   bool ``[link boost_regex.sub_match.op_compare6 operator >]`` (const sub_match<BidirectionalIterator>& lhs,
+                  const sub_match<BidirectionalIterator>& rhs);
+
+
+   //
+   // comparisons to a basic_string:
+   //
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare7 operator ==]`` (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare8 operator != ]``(const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare9 operator <]`` (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare10 operator >]`` (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare11 operator >= ]``(const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare12 operator <= ]``(const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare13 operator == ]``(const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare14 operator != ]``(const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare15 operator < ]``(const sub_match<BidirectionalIterator>& lhs,
+                  const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                          traits, 
+                                          Allocator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare16 operator > ]``(const sub_match<BidirectionalIterator>& lhs,
+                  const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                          traits, 
+                                          Allocator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare17 operator >= ]``(const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                          traits, 
+                                          Allocator>& rhs);
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool ``[link boost_regex.sub_match.op_compare18 operator <= ]``(const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& rhs);
+
+   //
+   // comparisons to a pointer to a character array:
+   //
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare19 operator == ]``(typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare20 operator != ]``(typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare21 operator < ]``(typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare22 operator > ]``(typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare23 operator >= ]``(typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare24 operator <= ]``(typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare25 operator == ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare26 operator != ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare27 operator < ]``(const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare28 operator > ]``(const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare29 operator >= ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare30 operator <= ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+
+   //
+   // comparisons to a single character:
+   //
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare31 operator == ]``(typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare32 operator != ]``(typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare33 operator < ]``(typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare34 operator > ]``(typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare35 operator >= ]``(typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare36 operator <= ]``(typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare37 operator == ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare38 operator != ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare39 operator < ]``(const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare40 operator > ]``(const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare41 operator >= ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+   template <class BidirectionalIterator> 
+   bool ``[link boost_regex.sub_match.op_compare42 operator <= ]``(const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+   // 
+   // addition operators: 
+   //
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, traits, Allocator> 
+      ``[link boost_regex.sub_match.op_add1 operator + ]``(const std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, 
+                                          traits, 
+                                          Allocator>& s, 
+                  const sub_match<BidirectionalIterator>& m); 
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, traits, Allocator>
+      ``[link boost_regex.sub_match.op_add2 operator + ]``(const sub_match<BidirectionalIterator>& m, 
+                  const std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, 
+                                          traits, 
+                                          Allocator>& s); 
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      ``[link boost_regex.sub_match.op_add3 operator + ]``(typename iterator_traits<BidirectionalIterator>::value_type const* s, 
+                  const sub_match<BidirectionalIterator>& m); 
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      ``[link boost_regex.sub_match.op_add4 operator + ]``(const sub_match<BidirectionalIterator>& m, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const * s);
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      ``[link boost_regex.sub_match.op_add5 operator + ]``(typename iterator_traits<BidirectionalIterator>::value_type const& s, 
+                  const sub_match<BidirectionalIterator>& m); 
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      ``[link boost_regex.sub_match.op_add6 operator + ]``(const sub_match<BidirectionalIterator>& m, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const& s); 
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      ``[link boost_regex.sub_match.op_add7 operator + ]``(const sub_match<BidirectionalIterator>& m1,
+                  const sub_match<BidirectionalIterator>& m2);
+
+   //
+   // stream inserter:
+   //
+   template <class charT, class traits, class BidirectionalIterator>
+   basic_ostream<charT, traits>&
+      ``[link boost_regex.sub_match.op_stream operator << ]``(basic_ostream<charT, traits>& os,
+                  const sub_match<BidirectionalIterator>& m);
+
+   } // namespace boost
+
+[h4 Description]
+
+[h5 Members]
+
+[#boost_regex.sub_match.value_type]
+
+   typedef typename std::iterator_traits<iterator>::value_type value_type;
+
+The type pointed to by the iterators.
+
+[#boost_regex.sub_match.diff_type]
+
+   typedef typename std::iterator_traits<iterator>::difference_type difference_type;
+
+A type that represents the difference between two iterators.
+
+[#boost_regex.sub_match.it_type]
+
+   typedef BidirectionalIterator iterator;
+
+The iterator type.
+
+[#boost_regex.sub_match.first]
+
+   iterator first
+
+An iterator denoting the position of the start of the match.
+
+[#boost_regex.sub_match.second]
+
+   iterator second
+
+An iterator denoting the position of the end of the match.
+
+[#boost_regex.sub_match.matched]
+
+   bool matched
+
+A Boolean value denoting whether this sub-expression participated in the match.
+
+[#boost_regex.sub_match.length]
+
+   static difference_type length();
+
+[*Effects]: returns the length of this matched sub-expression, or 0 
+if this sub-expression was not matched: `matched ? distance(first, second) : 0)`.
+
+[#boost_regex.sub_match.cast]
+
+   operator basic_string<value_type>()const;
+
+[*Effects]: converts `*this` into a string: returns 
+`(matched ? basic_string<value_type>(first, second) : basic_string<value_type>())`.
+
+[#boost_regex.sub_match.str]
+
+   basic_string<value_type> str()const;
+
+[*Effects]: returns a string representation of `*this`:  
+`(matched ? basic_string<value_type>(first, second) : basic_string<value_type>())`.
+
+[#boost_regex.sub_match.compare1]
+
+   int compare(const sub_match& s)const;
+
+[*Effects]: performs a lexical comparison to /s/: returns `str().compare(s.str())`.
+
+[#boost_regex.sub_match.compare2]
+
+   int compare(const basic_string<value_type>& s)const;
+
+[*Effects]: compares `*this` to the string /s/: returns `str().compare(s)`.
+
+[#boost_regex.sub_match.compare3]
+
+   int compare(const value_type* s)const;
+
+[*Effects]: compares `*this` to the null-terminated string /s/: returns `str().compare(s)`.
+
+[#boost_regex.sub_match.cap_seq_type]
+
+   typedef implementation-private capture_sequence_type;
+
+Defines an implementation-specific type that satisfies the requirements of 
+a standard library Sequence (21.1.1 including the optional Table 68 operations), 
+whose value_type is a `sub_match<BidirectionalIterator>`. This type 
+happens to be `std::vector<sub_match<BidirectionalIterator> >`, but you 
+shouldn't actually rely on that.
+
+[#boost_regex.sub_match.captures]
+
+   const capture_sequence_type& captures()const; 
+
+[*Effects]: returns a sequence containing all the captures obtained for this 
+sub-expression.
+
+[*Preconditions]: the library must be built and used with 
+BOOST_REGEX_MATCH_EXTRA defined, and you must pass the flag `match_extra` 
+to the regex matching functions ([regex_match], [regex_search], 
+[regex_iterator] or [regex_token_iterator]) in order for this member 
+#function to be defined and return useful information.
+
+[*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.
+
+[h5 sub_match non-member operators]
+
+[#boost_regex.sub_match.op_compare1]
+
+   template <class BidirectionalIterator>
+   bool operator == (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs.compare(rhs) == 0`.
+
+[#boost_regex.sub_match.op_compare2]
+
+   template <class BidirectionalIterator>
+   bool operator != (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs.compare(rhs) != 0`.
+
+[#boost_regex.sub_match.op_compare3]
+
+   template <class BidirectionalIterator>
+   bool operator < (const sub_match<BidirectionalIterator>& lhs,
+                  const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs.compare(rhs) < 0`.
+
+[#boost_regex.sub_match.op_compare4]
+
+   template <class BidirectionalIterator>
+   bool operator <= (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs.compare(rhs) <= 0`.
+
+[#boost_regex.sub_match.op_compare5]
+
+   template <class BidirectionalIterator>
+   bool operator >= (const sub_match<BidirectionalIterator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs.compare(rhs) >= 0`.
+
+[#boost_regex.sub_match.op_compare6]
+
+   template <class BidirectionalIterator>
+   bool operator > (const sub_match<BidirectionalIterator>& lhs,
+                  const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs.compare(rhs) > 0`.
+
+[#boost_regex.sub_match.op_compare7]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator == (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                                             traits,
+                                                             Allocator>& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs == rhs.str()`.
+
+[#boost_regex.sub_match.op_compare8]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator != (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                                             traits, 
+                                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs != rhs.str()`.
+
+[#boost_regex.sub_match.op_compare9]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator < (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                            traits, 
+                                            Allocator>& lhs,
+                    const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs < rhs.str()`.
+
+[#boost_regex.sub_match.op_compare10]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator > (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                                            traits, 
+                                                            Allocator>& lhs,
+                    const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs > rhs.str()`.
+
+[#boost_regex.sub_match.op_compare11]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator >= (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs >= rhs.str()`.
+
+[#boost_regex.sub_match.op_compare12]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator <= (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& lhs,
+                     const sub_match<BidirectionalIterator>& rhs);
+
+[*Effects]: returns `lhs <= rhs.str()`.
+
+[#boost_regex.sub_match.op_compare13]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator == (const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& rhs);
+
+[*Effects]: returns `lhs.str() == rhs`.
+
+[#boost_regex.sub_match.op_compare14]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator != (const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& rhs);
+
+[*Effects]: returns `lhs.str() != rhs`.
+
+[#boost_regex.sub_match.op_compare15]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator < (const sub_match<BidirectionalIterator>& lhs,
+                  const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                          traits, 
+                                          Allocator>& rhs);
+
+[*Effects]: returns `lhs.str() < rhs`.
+
+[#boost_regex.sub_match.op_compare16]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator > (const sub_match<BidirectionalIterator>& lhs,
+                    const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                            traits, 
+                                            Allocator>& rhs);
+
+[*Effects]: returns `lhs.str() > rhs`.
+
+[#boost_regex.sub_match.op_compare17]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator >= (const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& rhs);
+
+[*Effects]: returns `lhs.str() >= rhs`.
+
+[#boost_regex.sub_match.op_compare18]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   bool operator <= (const sub_match<BidirectionalIterator>& lhs,
+                     const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
+                                             traits, 
+                                             Allocator>& rhs);
+
+[*Effects]: returns `lhs.str() <= rhs`.
+
+[#boost_regex.sub_match.op_compare19]
+
+   template <class BidirectionalIterator> 
+   bool operator == (typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs == rhs.str()`.
+
+[#boost_regex.sub_match.op_compare20]
+
+   template <class BidirectionalIterator> 
+   bool operator != (typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs != rhs.str()`.
+
+[#boost_regex.sub_match.op_compare21]
+
+   template <class BidirectionalIterator> 
+   bool operator < (typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs < rhs.str()`.
+
+[#boost_regex.sub_match.op_compare22]
+
+   template <class BidirectionalIterator> 
+   bool operator > (typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs > rhs.str()`.
+
+[#boost_regex.sub_match.op_compare23]
+
+   template <class BidirectionalIterator> 
+   bool operator >= (typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs >= rhs.str()`.
+
+[#boost_regex.sub_match.op_compare24]
+
+   template <class BidirectionalIterator> 
+   bool operator <= (typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs <= rhs.str()`.
+
+[#boost_regex.sub_match.op_compare25]
+
+   template <class BidirectionalIterator> 
+   bool operator == (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+
+[*Effects]: returns `lhs.str() == rhs`.
+
+[#boost_regex.sub_match.op_compare26]
+
+   template <class BidirectionalIterator> 
+   bool operator != (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+
+[*Effects]: returns `lhs.str() != rhs`.
+
+[#boost_regex.sub_match.op_compare27]
+
+   template <class BidirectionalIterator> 
+   bool operator < (const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+
+[*Effects]: returns `lhs.str() < rhs`.
+
+[#boost_regex.sub_match.op_compare28]
+
+   template <class BidirectionalIterator> 
+   bool operator > (const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+
+[*Effects]: returns `lhs.str() > rhs`.
+
+[#boost_regex.sub_match.op_compare29]
+
+   template <class BidirectionalIterator> 
+   bool operator >= (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+
+[*Effects]: returns `lhs.str() >= rhs`.
+
+[#boost_regex.sub_match.op_compare30]
+
+   template <class BidirectionalIterator> 
+   bool operator <= (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
+
+[*Effects]: returns `lhs.str() <= rhs`.
+
+[#boost_regex.sub_match.op_compare31]
+
+   template <class BidirectionalIterator> 
+   bool operator == (typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs == rhs.str()`.
+
+[#boost_regex.sub_match.op_compare32]
+
+   template <class BidirectionalIterator> 
+   bool operator != (typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs != rhs.str()`.
+
+[#boost_regex.sub_match.op_compare33]
+
+   template <class BidirectionalIterator> 
+   bool operator < (typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs < rhs.str()`.
+
+[#boost_regex.sub_match.op_compare34]
+
+   template <class BidirectionalIterator> 
+   bool operator > (typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                  const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs > rhs.str()`.
+
+[#boost_regex.sub_match.op_compare35]
+
+   template <class BidirectionalIterator> 
+   bool operator >= (typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs >= rhs.str()`.
+
+[#boost_regex.sub_match.op_compare36]
+
+   template <class BidirectionalIterator> 
+   bool operator <= (typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
+                     const sub_match<BidirectionalIterator>& rhs); 
+
+[*Effects]: returns `lhs <= rhs.str()`.
+
+[#boost_regex.sub_match.op_compare37]
+
+   template <class BidirectionalIterator> 
+   bool operator == (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+
+[*Effects]: returns `lhs.str() == rhs`.
+
+[#boost_regex.sub_match.op_compare38]
+
+   template <class BidirectionalIterator> 
+   bool operator != (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+
+[*Effects]: returns `lhs.str() != rhs`.
+
+[#boost_regex.sub_match.op_compare39]
+
+   template <class BidirectionalIterator> 
+   bool operator < (const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+
+[*Effects]: returns `lhs.str() < rhs`.
+
+[#boost_regex.sub_match.op_compare40]
+
+   template <class BidirectionalIterator> 
+   bool operator > (const sub_match<BidirectionalIterator>& lhs, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+
+[*Effects]: returns `lhs.str() > rhs`.
+
+[#boost_regex.sub_match.op_compare41]
+
+   template <class BidirectionalIterator> 
+   bool operator >= (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+
+[*Effects]: returns `lhs.str() >= rhs`.
+
+[#boost_regex.sub_match.op_compare42]
+
+   template <class BidirectionalIterator> 
+   bool operator <= (const sub_match<BidirectionalIterator>& lhs, 
+                     typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
+
+[*Effects]: returns `lhs.str() <= rhs`.
+
+The addition operators for [sub_match] allow you to add a [sub_match] 
+to any type to which you can add a `std::string` and obtain a new 
+string as the result.
+
+[#boost_regex.sub_match.op_add1]
+
+   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, 
+                                          Allocator>& s, 
+                  const sub_match<BidirectionalIterator>& m); 
+
+[*Effects]: returns `s + m.str()`.
+
+[#boost_regex.sub_match.op_add2]
+
+   template <class BidirectionalIterator, class traits, class Allocator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, traits, Allocator>
+      operator + (const sub_match<BidirectionalIterator>& m, 
+                  const std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, 
+                                          traits, 
+                                          Allocator>& s); 
+
+[*Effects]: returns `m.str() + s`.
+
+[#boost_regex.sub_match.op_add3]
+
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      operator + (typename iterator_traits<BidirectionalIterator>::value_type const* s, 
+                  const sub_match<BidirectionalIterator>& m); 
+
+[*Effects]: returns `s + m.str()`.
+
+[#boost_regex.sub_match.op_add4]
+
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      operator + (const sub_match<BidirectionalIterator>& m, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const * s);
+
+[*Effects]: returns `m.str() + s`.
+
+[#boost_regex.sub_match.op_add5]
+
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      operator + (typename iterator_traits<BidirectionalIterator>::value_type const& s, 
+                  const sub_match<BidirectionalIterator>& m); 
+
+[*Effects]: returns `s + m.str()`.
+
+[#boost_regex.sub_match.op_add6]
+
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      operator + (const sub_match<BidirectionalIterator>& m, 
+                  typename iterator_traits<BidirectionalIterator>::value_type const& s); 
+
+[*Effects]: returns `m.str() + s`.
+
+[#boost_regex.sub_match.op_add7]
+
+   template <class BidirectionalIterator> 
+   std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type> 
+      operator + (const sub_match<BidirectionalIterator>& m1,
+                  const sub_match<BidirectionalIterator>& m2);
+
+[*Effects]: returns `m1.str() + m2.str()`.
+
+[h5 Stream inserter]
+
+[#boost_regex.sub_match.op_stream]
+
+   template <class charT, class traits, class BidirectionalIterator>
+   basic_ostream<charT, traits>&
+      operator << (basic_ostream<charT, traits>& os
+                  const sub_match<BidirectionalIterator>& m);
+
+[*Effects]: returns `(os << m.str())`. 
+     
+[endsect]
+
diff --git a/doc/syntax.html b/doc/syntax.html
deleted file mode 100644
index e2b62f87..00000000
--- a/doc/syntax.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <P>This section covers the regular expression syntax used by this library, this is 
-         a programmers guide, the actual syntax presented to your program's users will 
-         depend upon the <A href="syntax_option_type.html">flags</A> used during 
-         expression compilation.
-      </P>
-      <P>There are three main syntax options available, depending upon how 
-         you&nbsp;construct the regular expression object:</P>
-      <UL>
-         <LI>
-            <A href="syntax_perl.html">Perl</A>&nbsp;(this is the default behavior).</LI>
-         <LI>
-            <A href="syntax_extended.html">POSIX extended</A> (including the <A href="syntax_extended.html#egrep">
-               egrep</A> and <A href="syntax_extended.html#awk">awk</A> variations).</LI>
-         <LI>
-            <A href="syntax_basic.html">POSIX Basic</A> (including the <A href="syntax_basic.html#grep">
-               grep</A> and <A href="syntax_basic.html#emacs">emacs</A> variations).</LI></UL>
-      <P>You can also construct a regular expression that treats every character as a <A href="syntax_option_type.html#literals">
-            literal</A>, but that's not really a "syntax"!</P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         10 Sept 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/syntax.qbk b/doc/syntax.qbk
new file mode 100644
index 00000000..ec3e3189
--- /dev/null
+++ b/doc/syntax.qbk
@@ -0,0 +1,33 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:syntax Regular Expression Syntax]
+
+This section covers the regular expression syntax used by this library, 
+this is a programmers guide, the actual syntax presented to your program's 
+users will depend upon the flags used during expression compilation.
+
+There are three main syntax options available, depending upon how you 
+construct the regular expression object:
+
+* [link boost_regex.syntax.perl_syntax Perl (this is the default behavior)].
+* [link boost_regex.syntax.basic_extended POSIX extended (including the egrep and awk variations)].
+* [link boost_regex.syntax.basic_syntax POSIX Basic (including the grep and emacs variations)].
+
+You can also construct a regular expression that treats every character as a 
+literal, but that's not really a "syntax"!
+
+[include syntax_perl.qbk]
+[include syntax_extended.qbk]
+[include syntax_basic.qbk]
+[include character_class_names.qbk]
+[include collating_names.qbk]
+[include leftmost_longest.qbk]
+
+[endsect]
+
diff --git a/doc/syntax_basic.html b/doc/syntax_basic.html
deleted file mode 100644
index 14096c38..00000000
--- a/doc/syntax_basic.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: POSIX-Basic Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">POSIX Basic Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#Basic">POSIX Basic Syntax</A> <dt><A href="#variations">
-                     Variations</A>
-                  <dd>
-                     <dl>
-                        <dt><A href="#grep">Grep</A> <dt><A href="#emacs">Emacs</A></dt>
-                     </dl>
-                     <dt><A href="#options">Options</A> <dt><A href="#refs">References</A></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The POSIX-Basic regular expression syntax is used by the Unix utility <EM>sed</EM>, 
-         and variations are used by <EM>grep</EM> and <EM>emacs</EM>.&nbsp; You can 
-         construct POSIX basic regular expressions in Boost.Regex by passing the flag <EM>basic</EM>
-         to the regex constructor, for example:</P>
-      <PRE>// 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);</PRE>
-      <H3>POSIX Basic Syntax<A name="Basic"></A></H3>
-      <P>In POSIX-Basic regular expressions, all characters are match themselves except 
-         for the following special characters:</P>
-      <PRE>.[\*^$</PRE>
-      <H4>Wildcard:</H4>
-      <P>The single character '.' when used outside of a character set will match any 
-         single character except:</P>
-      <P>The NULL character when the flag <EM>match_no_dot_null</EM> is passed to the 
-         matching algorithms.</P>
-      <P>The newline character when the flag <EM>match_not_dot_newline</EM> is passed to 
-         the matching algorithms.</P>
-      <H4>Anchors:</H4>
-      <P>A '^' character shall match the start of a line when used as the first 
-         character of an expression, or the first character of a sub-expression.</P>
-      <P>A '$' character shall match the end of a line when used as the last character 
-         of an expression, or the last character of a sub-expression.</P>
-      <H4>Marked sub-expressions:</H4>
-      <P>A section beginning \( and ending \) acts as a marked sub-expression.&nbsp; 
-         Whatever matched the sub-expression is split out in a separate field by the 
-         matching algorithms.&nbsp; Marked sub-expressions can also repeated, or 
-         referred-to by a back-reference.</P>
-      <H4>Repeats:</H4>
-      <P>Any atom (a single character, a marked sub-expression, or a character class) 
-         can be repeated with the * operator.</P>
-      <P>For example a* will match any number of letter a's repeated zero or more times 
-         (an atom repeated zero times matches an empty string), so the expression a*b 
-         will match any of the following:</P>
-      <PRE>b
-ab
-aaaaaaaab</PRE>
-      <P>An atom can also be repeated with a bounded repeat:</P>
-      <P>a\{n\}&nbsp; Matches 'a' repeated exactly <EM>n</EM> times.</P>
-      <P>a\{n,\}&nbsp; Matches 'a' repeated <EM>n</EM> or more times.</P>
-      <P>a\{n, m\}&nbsp; Matches 'a' repeated between <EM>n</EM> and <EM>m</EM> times 
-         inclusive.</P>
-      <P>For example:</P>
-      <PRE>^a\{2,3\}$</PRE>
-      <P>Will match either of:</P>
-      <PRE>aa
-aaa</PRE>
-      <P>But neither of:</P>
-      <PRE>a
-aaaa</PRE>
-      <P>It is an error to use a repeat operator, if the preceding construct can not be 
-         repeated, for example:</P>
-      <PRE>a\(*\)</PRE>
-      <P>Will raise an error, as there is nothing for the * operator to be applied to.</P>
-      <H4>Back references:</H4>
-      <P>An escape character followed by a digit <EM>n</EM>, where <EM>n </EM>is in the 
-         range 1-9, matches the same string that was matched by sub-expression <EM>n</EM>.&nbsp; 
-         For example the expression:</P>
-      <PRE>^\(a*\).*\1$</PRE>
-      <P>Will match the string:</P>
-      <PRE>aaabbaaa</PRE>
-      <P>But not the string:</P>
-      <PRE>aaabba</PRE>
-      <H4>Character sets:</H4>
-      <P>A character set is a bracket-expression starting with [ and ending with ], it 
-         defines a set of characters, and matches any single character that is a member 
-         of that set.</P>
-      <P>A bracket expression may contain any combination of the following:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Single characters:</H5>
-         <P>For example [abc], will match any of the characters 'a', 'b', or 'c'.</P>
-         <H5>Character ranges:</H5>
-         <P>For example [a-c] will match any single character in the range 'a' to 
-            'c'.&nbsp; By default, for POSIX-Basic regular expressions, a character <EM>x</EM>
-            is within the range <EM>y</EM> to <EM>z</EM>, if it collates within that 
-            range;&nbsp;this results in locale specific behavior.&nbsp; This behavior can 
-            be turned off by unsetting the <EM><A href="syntax_option_type.html#basic">collate</A></EM>
-            option flag - in which case whether a character appears within a range is 
-            determined by comparing the code points of the characters only</P>
-         <H5>Negation:</H5>
-         <P>If the bracket-expression begins with the ^ character, then it matches the 
-            complement of the characters it contains, for example [^a-c] matches any 
-            character that is not in the range a-c.</P>
-         <H5>Character classes:</H5>
-         <P>An expression of the form [[:name:]] matches the named character class "name", 
-            for example [[:lower:]] matches any lower case character.&nbsp; See <A href="character_class_names.html">
-               character class names</A>.</P>
-         <H5>Collating Elements:</H5>
-         <P>An expression of the form [[.col.] matches the collating element <EM>col</EM>.&nbsp; 
-            A collating element is any single character, or any sequence of characters that 
-            collates as a single unit.&nbsp; Collating elements may also be used as the end 
-            point of a range, for example: [[.ae.]-c] matches the character sequence "ae", 
-            plus any single character in the rangle "ae"-c, assuming that "ae" is treated 
-            as a single collating element in the current locale.</P>
-         <P>Collating elements may be used in place of escapes (which are not normally 
-            allowed inside character sets), for example [[.^.]abc] would match either one 
-            of the characters 'abc^'.</P>
-         <P>As an extension, a collating element may also be specified via its <A href="collating_names.html">
-               symbolic name</A>, for example:</P>
-         <P>[[.NUL.]]</P>
-         <P>matches a NUL character.</P>
-         <H5>Equivalence classes:</H5>
-         <P>
-            An expression of theform[[=col=]], matches any character or collating element 
-            whose primary sort key is the same as that for collating element <EM>col</EM>, 
-            as with collating elements the name <EM>col</EM> may be a <A href="collating_names.html">
-               symbolic name</A>.&nbsp; A primary sort key is one that ignores case, 
-            accentation, or locale-specific tailorings; so for example [[=a=]] matches any 
-            of the characters: a, à, á, â, ã, ä, å, A, À, Á, Â, Ã, Ä and Å.&nbsp; 
-            Unfortunately implementation of this is reliant on the platform's collation and 
-            localisation support; this feature can not be relied upon to work portably 
-            across all platforms, or even all locales on one platform.</P>
-      </BLOCKQUOTE>
-      <H5>Combinations:</H5>
-      <P>All of the above can be combined in one character set declaration, for example: 
-         [[:digit:]a-c[.NUL.]].</P>
-      <H4>Escapes</H4>
-      <P>With the exception of the escape sequences \{, \}, \(, and \), which are 
-         documented above, an escape followed by any character matches that 
-         character.&nbsp; This can be used to make the special characters .[\*^$, 
-         "ordinary".&nbsp; Note that the escape character loses its special meaning 
-         inside a character set, so [\^] will match either a literal '\' or a '^'.</P>
-      <H4>What Gets Matched</H4>
-      <P>When there is more that one way to match a regular expression, the "best" 
-         possible match is obtained using the <A href="syntax_leftmost_longest.html">leftmost-longest 
-            rule</A>.</P>
-      <H3><A name="variations"></A>Variations</H3>
-      <H4><A name="grep"></A>Grep</H4>
-      <P>When an expression is compiled with the flag <EM>grep</EM> set, then the 
-         expression is treated as a newline separated list of <A href="#Basic">POSIX-Basic</A>
-         expressions, a match is found if any of the expressions in the list match, for 
-         example:</P>
-      <PRE>boost::regex e("abc\ndef", boost::regex::grep);</PRE>
-      <P>will match either of the POSIX-Basic expressions "abc" or "def".</P>
-      <P>As its name suggests, this behavior is consistent with the Unix utility <EM>grep</EM>.</P>
-      <H4><A name="emacs"></A>emacs</H4>
-      <P>In addition to the <A href="#Basic">POSIX-Basic features</A> the following 
-         characters are also special:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>+ repeats the preceding atom one or more times.</P>
-         <P>? repeats the preceding atom zero or one times.</P>
-         <P>*? A non-greedy version of *.</P>
-         <P>+? A non-greedy version of +.</P>
-         <P>?? A non-greedy version of ?.</P>
-      </BLOCKQUOTE>
-      <P>And the following escape sequences are also recognised:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>\| specifies an alternative.</P>
-         <P>\(?:&nbsp; ...&nbsp; \) is a non-marking grouping construct - allows you to 
-            lexically group something without spitting out an extra sub-expression.</P>
-         <P>\w&nbsp; matches any word character.</P>
-         <P>\W matches any non-word character.</P>
-         <P>\sx matches any character in the syntax group <EM>x</EM>, the following emacs 
-            groupings are supported: 's', ' ', '_', 'w', '.', ')', '(', '"', '\'', '&gt;' 
-            and '&lt;'.&nbsp; Refer to the emacs docs for details.</P>
-         <P>\Sx matches any character not in the syntax grouping <EM>x</EM>.</P>
-         <P>\c and \C are not supported.</P>
-         <P>\` matches zero characters only at the start of a buffer (or string being 
-            matched).</P>
-         <P>\' matches zero characters only at the end of a buffer (or string being 
-            matched).</P>
-         <P>\b matches zero characters at a word boundary.</P>
-         <P>\B matches zero characters, not at a word boundary.</P>
-         <P>\&lt; matches zero characters only at the start of a word.</P>
-         <P>\&gt; matches zero characters only at the end of a word.</P>
-      </BLOCKQUOTE>
-      <P dir="ltr">Finally, you should note that emacs style regular expressions are 
-         matched according to the <A href="syntax_perl.html#what">Perl "depth first search" 
-            rules</A>.&nbsp; Emacs expressions are matched this way because they contain 
-         Perl-like extensions, that do not interact well with the <A href="syntax_leftmost_longest.html">
-            POSIX-style leftmost-longest rule</A>.</P>
-      <H3><A name="options"></A>Options</H3>
-      <P>There are a <A href="syntax_option_type.html#basic">variety of flags</A> that 
-         may be combined with the <EM>basic</EM> and <EM>grep</EM> options when 
-         constructing the regular expression, in particular note that the <A href="syntax_option_type.html#basic">
-            newline_alt, no_char_classes, no-intervals, bk_plus_qm and bk_plus_vbar</A> options 
-         all alter the syntax, while the <A href="syntax_option_type.html#basic">collate 
-            and icase</A> options modify how the case and locale sensitivity are to be 
-         applied.</P>
-      <H3><A name="refs"></A>References</H3>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html">IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions 
-            and Headers, Section 9, Regular Expressions (FWD.1).</A></P>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html">IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-            Utilities, Section 4, Utilities, grep (FWD.1).</A></P>
-      <P><A href="http://www.gnu.org/software/emacs/">Emacs Version 21.3</A>.</P>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21 Aug 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;2004</I></P>
-      <I>
-         <P><I>Use, modification and distribution are subject to the Boost Software License, 
-               Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-               or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>).</I></P>
-      </I>
-   </body>
-</html>
diff --git a/doc/syntax_basic.qbk b/doc/syntax_basic.qbk
new file mode 100644
index 00000000..75f7ce5f
--- /dev/null
+++ b/doc/syntax_basic.qbk
@@ -0,0 +1,289 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:basic_syntax POSIX Basic Regular Expression Syntax]
+
+[h3 Synopsis]
+
+The POSIX-Basic regular expression syntax is used by the Unix utility `sed`, 
+and variations are used by `grep` and `emacs`.  You can construct POSIX 
+basic regular expressions in Boost.Regex by passing 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);
+
+[#boost_regex.posix_basic][h3 POSIX Basic Syntax]
+
+In POSIX-Basic regular expressions, all characters are match themselves except 
+for the following special characters:
+
+[pre .\[\\*^$]
+
+[h4 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.
+
+[h4 Anchors:]
+
+A '^' character shall match the start of a line when used as the first 
+character of an expression, or the first character of a sub-expression.
+
+A '$' character shall match the end of a line when used as the last 
+character of an expression, or the last character of a sub-expression.
+
+[h4 Marked sub-expressions:]
+
+A section beginning `\(` and ending `\)` acts as a marked sub-expression.  
+Whatever matched the sub-expression is split out in a separate field by the 
+matching algorithms.  Marked sub-expressions can also repeated, or 
+referred-to by a back-reference.
+
+[h4 Repeats:]
+
+Any atom (a single character, a marked sub-expression, or a character class) 
+can be repeated with the \* operator.
+
+For example `a*` will match any number of letter a's repeated zero or more 
+times (an atom repeated zero times matches an empty string), so the 
+expression `a*b` will match any of the following:
+
+[pre
+b
+ab
+aaaaaaaab
+]
+
+An atom can also be repeated with a bounded repeat:
+
+`a\{n\}`  Matches 'a' repeated exactly n times.
+
+`a\{n,\}`  Matches 'a' repeated n or more times.
+
+`a\{n, m\}`  Matches 'a' repeated between n and m times inclusive.
+
+For example:
+
+[pre ^a\{2,3\}$]
+
+Will match either of:
+
+[pre
+aa
+aaa
+]
+
+But neither of:
+
+[pre
+a
+aaaa
+]
+
+It is an error to use a repeat operator, if the preceding construct can not be 
+repeated, for example:
+
+[pre a\(*\)]
+
+Will raise an error, as there is nothing for the \* operator to be applied to.
+
+[h4 Back references:]
+
+An escape character followed by a digit /n/, where /n/ is in the range 1-9, 
+matches the same string that was matched by sub-expression /n/.  For example 
+the expression:
+
+[pre ^\\(a\*\\).\*\\1$]
+
+Will match the string:
+
+[pre aaabbaaa]
+
+But not the string:
+
+[pre aaabba]
+
+[h4 Character sets:]
+
+A character set is a bracket-expression starting with \[ and ending with \], 
+it defines a set of characters, and matches any single character that is a 
+member of that set.
+
+A bracket expression may contain any combination of the following:
+
+[h5 Single characters:]
+
+For example `[abc]`, will match any of the characters 'a', 'b', or 'c'.
+
+[h5 Character ranges:]
+
+For example `[a-c]` will match any single character in the range 'a' to 'c'.  
+By default, for POSIX-Basic regular expressions, a character /x/ is within the 
+range /y/ to /z/, if it collates within that range; this results in 
+locale specific behavior.  This behavior can be turned off by unsetting 
+the `collate` option flag when constructing the regular expression 
+- in which case whether a character appears within 
+a range is determined by comparing the code points of the characters only.
+
+[h5 Negation:]
+
+If the bracket-expression begins with the ^ character, then it matches the 
+complement of the characters it contains, for example `[^a-c]` matches 
+any character that is not in the range a-c.
+
+[h5 Character classes:]
+
+An expression of the form `[[:name:]]` matches the named character class "name", 
+for example `[[:lower:]]` matches any lower case character.  
+See [link boost_regex.syntax.character_classes character class names].
+
+[h5 Collating Elements:]
+
+An expression of the form `[[.col.]` matches the collating element /col/.  
+A collating element is any single character, or any sequence of 
+characters that collates as a single unit.  Collating elements may also 
+be used as the end point of a range, for example: `[[.ae.]-c]` matches 
+the character sequence "ae", plus any single character in the rangle "ae"-c, 
+assuming that "ae" is treated as a single collating element in the current locale.
+
+Collating elements may be used in place of escapes (which are not 
+normally allowed inside character sets), for example `[[.^.]abc]` would 
+match either one of the characters 'abc^'.
+
+As an extension, a collating element may also be specified via its 
+symbolic name, for example:
+
+[pre \[\[\.NUL\.\]\]]
+
+matches a 'NUL' character.  
+See [link boost_regex.syntax.collating_names collating element names].
+
+[h5 Equivalence classes:]
+
+An expression of theform `[[=col=]]`, matches any character or collating 
+element whose primary sort key is the same as that for collating element 
+/col/, as with collating elements the name /col/ may be a 
+[link boost_regex.syntax.collating_names collating symbolic name].  
+A primary sort key is one that ignores case, accentation, or 
+locale-specific tailorings; so for example `[[=a=]]` matches any of 
+the characters: a, '''&#xC0;''', '''&#xC1;''', '''&#xC2;''', 
+'''&#xC3;''', '''&#xC4;''', '''&#xC5;''', A, '''&#xE0;''', '''&#xE1;''', 
+'''&#xE2;''', '''&#xE3;''', '''&#xE4;''' and '''&#xE5;'''.  
+Unfortunately implementation of this is reliant on the platform's 
+collation and localisation support; this feature can not be relied 
+upon to work portably across all platforms, or even all locales on one platform.
+
+[h5 Combinations:]
+
+All of the above can be combined in one character set declaration, for 
+example: `[[:digit:]a-c[.NUL.]].`
+
+[h4 Escapes]
+
+With the exception of the escape sequences \\{, \\}, \\(, and \\), 
+which are documented above, an escape followed by any character matches 
+that character.  This can be used to make the special characters 
+
+[pre .\[\\\*^$]
+
+"ordinary".  Note that the escape character loses its special meaning 
+inside a character set, so `[\^]` will match either a literal '\\' or a '^'.
+
+[h3 What Gets Matched]
+
+When there is more that one way to match a regular expression, the 
+"best" possible match is obtained using the 
+[link boost_regex.syntax.leftmost_longest_rule leftmost-longest rule].
+
+[h3 Variations]
+
+[#boost_regex.grep_syntax][h4 Grep]
+
+When an expression is compiled with the flag `grep` set, then the 
+expression is treated as a newline separated list of 
+[link boost_regex.posix_basic POSIX-Basic expressions], 
+a match is found if any of the expressions in the list match, for example:
+
+   boost::regex e("abc\ndef", boost::regex::grep);
+
+will match either of the [link boost_regex.posix_basic POSIX-Basic expressions] 
+"abc" or "def".
+
+As its name suggests, this behavior is consistent with the Unix utility grep.
+
+[h4 emacs]
+
+In addition to the [link boost_regex.posix_basic POSIX-Basic features] 
+the following characters are also special:
+
+[table
+[[Character][Description]]
+[[+][repeats the preceding atom one or more times.]]
+[[?][repeats the preceding atom zero or one times.]]
+[[*?][A non-greedy version of *.]]
+[[+?][A non-greedy version of +.]]
+[[??][A non-greedy version of ?.]]
+]
+
+And the following escape sequences are also recognised:
+
+[table
+[[Escape][Description]]
+[[\\|][specifies an alternative.]]
+[[\\(?:  ...  \)][is a non-marking grouping construct - allows you to lexically group something without spitting out an extra sub-expression.]]
+[[\\w][matches any word character.]]
+[[\\W][matches any non-word character.]]
+[[\\sx][matches any character in the syntax group x, the following 
+   emacs groupings are supported: 's', ' ', '_', 'w', '.', ')', '(', '"', '\\'', '>' and '<'.  Refer to the emacs docs for details.]]
+[[\\Sx][matches any character not in the syntax grouping x.]]
+[[\\c and \\C][These are not supported.]]
+[[\\`][matches zero characters only at the start of a buffer (or string being matched).]]
+[[\\'][matches zero characters only at the end of a buffer (or string being matched).]]
+[[\\b][matches zero characters at a word boundary.]]
+[[\\B][matches zero characters, not at a word boundary.]]
+[[\\<][matches zero characters only at the start of a word.]]
+[[\\>][matches zero characters only at the end of a word.]]
+]
+
+Finally, you should note that emacs style regular expressions are matched 
+according to the 
+[link boost_regex.syntax.perl_syntax.what_gets_matched Perl "depth first search" rules].  
+Emacs expressions are 
+matched this way because they contain Perl-like extensions, that do not 
+interact well with the 
+[link boost_regex.syntax.leftmost_longest_rule POSIX-style leftmost-longest rule].
+
+[h3 Options]
+
+There are a [link boost_regex.ref.syntax_option_type.syntax_option_type_basic variety of flags] that may be combined with the `basic` and `grep` 
+options when constructing the regular expression, in particular note 
+that the 
+[link boost_regex.ref.syntax_option_type.syntax_option_type_basic `newline_alt`, `no_char_classes`, `no-intervals`, `bk_plus_qm` 
+and `bk_plus_vbar`] options all alter the syntax, while the 
+[link boost_regex.ref.syntax_option_type.syntax_option_type_basic `collate` and `icase` options] modify how the case and locale sensitivity 
+are to be applied.
+
+[h3 References]
+
+[@http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions and Headers, Section 9, Regular Expressions (FWD.1).]
+
+[@http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and Utilities, Section 4, Utilities, grep (FWD.1).]
+
+[@http://www.gnu.org/software/emacs/ Emacs Version 21.3.]
+
+[endsect]
+
+
diff --git a/doc/syntax_extended.html b/doc/syntax_extended.html
deleted file mode 100644
index d9253166..00000000
--- a/doc/syntax_extended.html
+++ /dev/null
@@ -1,520 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: POSIX-Extended Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">POSIX-Extended Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#extended">POSIX&nbsp;Extended Syntax</A>
-               <dt><A href="#variations">Variations</A>
-                  <dd>
-                     <dl>
-                        <dt><A href="#egrep">egrep</A> <dt><A href="#awk">awk</A>&nbsp;</dt>
-                     </dl>
-                     <dt><A href="#options">Options</A> <dt><A href="#refs">References</A></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The POSIX-Extended regular expression syntax is supported by the POSIX C 
-         regular expression API's, and variations are used by the utilities <EM>egrep</EM>
-         and <EM>awk</EM>. You can construct POSIX extended regular expressions in 
-         Boost.Regex by passing the flag <EM>extended</EM> to the regex constructor, for 
-         example:</P>
-      <PRE>// 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);</PRE>
-      <H3>POSIX Extended Syntax<A name="extended"></A></H3>
-      <P>In POSIX-Extended regular expressions, all characters match themselves except 
-         for the following special characters:</P>
-      <PRE>.[{()\*+?|^$</PRE>
-      <H4>Wildcard:</H4>
-      <P>The single character '.' when used outside of a character set will match any 
-         single character except:</P>
-      <P>The NULL character when the flag <EM>match_no_dot_null</EM> is passed to the 
-         matching algorithms.</P>
-      <P>The newline character when the flag <EM>match_not_dot_newline</EM> is passed to 
-         the matching algorithms.</P>
-      <H4>Anchors:</H4>
-      <P>A '^' character shall match the start of a line when used as the first 
-         character of an expression, or the first character of a sub-expression.</P>
-      <P>A '$' character shall match the end of a line when used as the last character 
-         of an expression, or the last character of a sub-expression.</P>
-      <H4>Marked sub-expressions:</H4>
-      <P>A section beginning ( and ending ) acts as a marked sub-expression.&nbsp; 
-         Whatever matched the sub-expression is split out in a separate field by the 
-         matching algorithms.&nbsp; Marked sub-expressions can also repeated, or 
-         referred to by a back-reference.</P>
-      <H4>Repeats:</H4>
-      <P>Any atom (a single character, a marked sub-expression, or a character class) 
-         can be repeated with the *, +, ?, and {}&nbsp;operators.</P>
-      <P>The * operator will match the preceding atom zero or more times, for example 
-         the expression a*b will match any of the following:</P>
-      <PRE>b
-ab
-aaaaaaaab</PRE>
-      <P>The + operator will match the preceding atom one or more times, for example the 
-         expression a+b will match any of the following:</P>
-      <PRE>ab
-aaaaaaaab</PRE>
-      <P>But will not match:</P>
-      <PRE>b</PRE>
-      <P>The ? operator will match the preceding atom zero or&nbsp;one times, for 
-         example the expression ca?b will match any of the following:</P>
-      <PRE>cb
-cab</PRE>
-      <P>But will not match:</P>
-      <PRE>caab</PRE>
-      <P>An atom can also be repeated with a bounded repeat:</P>
-      <P>a{n}&nbsp; Matches 'a' repeated exactly <EM>n</EM> times.</P>
-      <P>a{n,}&nbsp; Matches 'a' repeated <EM>n</EM> or more times.</P>
-      <P>a{n, m}&nbsp; Matches 'a' repeated between <EM>n</EM> and <EM>m</EM> times 
-         inclusive.</P>
-      <P>For example:</P>
-      <PRE>^a{2,3}$</PRE>
-      <P>Will match either of:</P>
-      <PRE>aa
-aaa</PRE>
-      <P>But neither of:</P>
-      <PRE>a
-aaaa</PRE>
-      <P>It is an error to use a repeat operator, if the preceding construct can not be 
-         repeated, for example:</P>
-      <PRE>a(*)</PRE>
-      <P>Will raise an error, as there is nothing for the * operator to be applied to.</P>
-      <H4>Back references:</H4>
-      <P>An escape character followed by a digit <EM>n</EM>, where <EM>n </EM>is in the 
-         range 1-9, matches the same string that was matched by sub-expression <EM>n</EM>.&nbsp; 
-         For example the expression:</P>
-      <PRE>^(a*).*\1$</PRE>
-      <P>Will match the string:</P>
-      <PRE>aaabbaaa</PRE>
-      <P>But not the string:</P>
-      <PRE>aaabba</PRE>
-      <P><EM><STRONG>Caution</STRONG>: the POSIX standard does not support back-references 
-            for "extended" regular expressions, this is a compatible extension to that 
-            standard.</EM></P>
-      <H4>Alternation</H4>
-      <P>The | operator will match either of its arguments, so for example: abc|def will 
-         match either "abc" or "def".&nbsp;
-      </P>
-      <P>Parenthesis can be used to group alternations, for example: ab(d|ef) will match 
-         either of "abd" or "abef".</P>
-      <H4>Character sets:</H4>
-      <P>A character set is a bracket-expression starting with [ and ending with ], it 
-         defines a set of characters, and matches any single character that is a member 
-         of that set.</P>
-      <P>A bracket expression may contain any combination of the following:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Single characters:</H5>
-         <P>For example [abc], will match any of the characters 'a', 'b', or 'c'.</P>
-         <H5>Character ranges:</H5>
-         <P>For example [a-c] will match any single character in the range 'a' to 
-            'c'.&nbsp; By default, for POSIX-Extended regular expressions, a character <EM>x</EM>
-            is within the range <EM>y</EM> to <EM>z</EM>, if it collates within that 
-            range;&nbsp;<EM><STRONG>this results in locale specific behavior</STRONG></EM> .&nbsp; 
-            This behavior can be turned off by unsetting the <EM><A href="syntax_option_type.html#extended">
-                  collate</A></EM> option flag - in which case whether a character appears 
-            within a range is determined by comparing the code points of the characters 
-            only.</P>
-         <H5>Negation:</H5>
-         <P>If the bracket-expression begins with the ^ character, then it matches the 
-            complement of the characters it contains, for example [^a-c] matches any 
-            character that is not in the range a-c.</P>
-         <H5>Character classes:</H5>
-         <P>An expression of the form [[:name:]] matches the named character class "name", 
-            for example [[:lower:]] matches any lower case character.&nbsp; See <A href="character_class_names.html">
-               character class names</A>.</P>
-         <H5>Collating Elements:</H5>
-         <P>An expression of the form [[.col.] matches the collating element <EM>col</EM>.&nbsp; 
-            A collating element is any single character, or any sequence of characters that 
-            collates as a single unit.&nbsp; Collating elements may also be used as the end 
-            point of a range, for example: [[.ae.]-c] matches the character sequence "ae", 
-            plus any single character in the range "ae"-c, assuming that "ae" is treated as 
-            a single collating element in the current locale.</P>
-         <P>Collating elements may be used in place of escapes (which are not normally 
-            allowed inside character sets), for example [[.^.]abc] would match either one 
-            of the characters 'abc^'.</P>
-         <P>As an extension, a collating element may also be specified via its <A href="collating_names.html">
-               symbolic name</A>, for example:</P>
-         <P>[[.NUL.]]</P>
-         <P>matches a NUL character.</P>
-         <H5>Equivalence classes:</H5>
-         <P>
-            An expression oftheform[[=col=]], matches any character or collating element 
-            whose primary sort key is the same as that for collating element <EM>col</EM>, 
-            as with colating elements the name <EM>col</EM> may be a <A href="collating_names.html">
-               symbolic name</A>.&nbsp; A primary sort key is one that ignores case, 
-            accentation, or locale-specific tailorings; so for example [[=a=]] matches any 
-            of the characters: a, à, á, â, ã, ä, å, A, À, Á, Â, Ã, Ä and Å.&nbsp; 
-            Unfortunately implementation of this is reliant on the platform's collation and 
-            localisation support; this feature can not be relied upon to work portably 
-            across all platforms, or even all locales on one platform.</P>
-      </BLOCKQUOTE>
-      <H5>Combinations:</H5>
-      <P>All of the above can be combined in one character set declaration, for example: 
-         [[:digit:]a-c[.NUL.]].</P>
-      <H4>Escapes</H4>
-      <P>The POSIX standard defines no escape sequences for POSIX-Extended regular 
-         expressions, except that:</P>
-      <UL>
-         <LI>
-         Any special character preceded by an escape shall match itself.
-         <LI>
-         The effect of any ordinary character being preceded by an escape is undefined.
-         <LI>
-            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 [\^] will match either a literal '\' or a '^'.</LI></UL>
-      <P>However, that's rather restrictive, so the following standard-compatible 
-         extensions are also supported by Boost.Regex:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Escapes matching a specific character</H5>
-         <P>The following escape sequences are all synonyms for single characters:</P>
-         <P>
-            <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD><STRONG>Escape</STRONG></TD>
-                  <TD><STRONG>Character</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\a</TD>
-                  <TD>'\a'</TD>
-               </TR>
-               <TR>
-                  <TD>\e</TD>
-                  <TD>0x1B</TD>
-               </TR>
-               <TR>
-                  <TD>\f</TD>
-                  <TD>\f</TD>
-               </TR>
-               <TR>
-                  <TD>\n</TD>
-                  <TD>\n</TD>
-               </TR>
-               <TR>
-                  <TD>\r</TD>
-                  <TD>\r</TD>
-               </TR>
-               <TR>
-                  <TD>\t</TD>
-                  <TD>\t</TD>
-               </TR>
-               <TR>
-                  <TD>\v</TD>
-                  <TD>\v</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>\b (but only inside a character class declaration).</TD>
-               </TR>
-               <TR>
-                  <TD>\cX</TD>
-                  <TD>An ASCII escape sequence - the character whose code point is X % 32</TD>
-               </TR>
-               <TR>
-                  <TD>\xdd</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdd.</TD>
-               </TR>
-               <TR>
-                  <TD>\x{dddd}</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\0ddd</TD>
-                  <TD>An octal escape sequence - matches the single character whose code point is 
-                     0ddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\N{Name}</TD>
-                  <TD>Matches the single character which has the <A href="collating_names.html">symbolic 
-                        name</A> <EM>name.&nbsp; </EM>For example \N{newline} matches the single 
-                     character \n.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>"Single character" character&nbsp;classes:</H5>
-         <P>Any escaped character <EM>x</EM>, if <EM>x</EM> is the name of a character 
-            class shall match any character that is a member of that class, and any escaped 
-            character <EM>X</EM>, if <EM>x</EM> is the name of a character class, shall 
-            match any character not in that class.</P>
-         <P>The following are supported by default:</P>
-         <P>
-            <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="300" border="1">
-               <TR>
-                  <TD><STRONG>Escape sequence</STRONG></TD>
-                  <TD><STRONG>Equivalent to</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\d</TD>
-                  <TD>[[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\l</TD>
-                  <TD>[[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\s</TD>
-                  <TD>[[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\u</TD>
-                  <TD>[[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\w</TD>
-                  <TD>[[:word:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\D</TD>
-                  <TD>[^[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\L</TD>
-                  <TD>[^[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\S</TD>
-                  <TD>[^[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\U</TD>
-                  <TD>[^[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\W</TD>
-                  <TD>[^[:word:]]</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>
-            <H5>Character Properties</H5>
-         </H5>
-         <P dir="ltr">The character property names in the following table are all 
-            equivalent to the <A href="character_class_names.html">names used in character 
-               classes</A>.</P>
-         <H5>
-            <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="0">
-               <TR>
-                  <TD><STRONG>Form</STRONG></TD>
-                  <TD><STRONG>Description</STRONG></TD>
-                  <TD><STRONG>Equivalent character set form</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\pX</TD>
-                  <TD>Matches any character that has the property X.</TD>
-                  <TD>[[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\p{Name}</TD>
-                  <TD>Matches any character that has the property <EM>Name</EM>.</TD>
-                  <TD>[[:Name:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\PX</TD>
-                  <TD>Matches any character that does not have the property X.</TD>
-                  <TD>[^[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\P{Name}</TD>
-                  <TD>Matches any character that does not have the property <EM>Name</EM>.</TD>
-                  <TD>[^[:Name:]]</TD>
-               </TR>
-            </TABLE>
-         </H5>
-         <H5>Word Boundaries</H5>
-         <P>The following escape sequences match the boundaries of words:</P>
-         <P>
-            <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\&lt;</TD>
-                  <TD>Matches the start of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\&gt;</TD>
-                  <TD>Matches the end of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>Matches a word boundary (the start or end of a word).</TD>
-               </TR>
-               <TR>
-                  <TD>\B</TD>
-                  <TD>Matches only when not at a word boundary.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Buffer boundaries</H5>
-         <P>The following match only at buffer boundaries: a "buffer" in this context is 
-            the whole of the input text&nbsp;that is being matched against (note that ^ and 
-            $ may match embedded newlines within the text).</P>
-         <P>
-            <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\`</TD>
-                  <TD>Matches at the start of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\'</TD>
-                  <TD>Matches at the end of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\A</TD>
-                  <TD>Matches at the start of a buffer only (the same as \`).</TD>
-               </TR>
-               <TR>
-                  <TD>\z</TD>
-                  <TD>Matches at the end of a buffer only (the same as \').</TD>
-               </TR>
-               <TR>
-                  <TD>\Z</TD>
-                  <TD>Matches an optional sequence of newlines at the end of a buffer: equivalent to 
-                     the regular expression \n*\z</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Continuation Escape</H5>
-         <P>The sequence \G matches only at the end of the last match found, or at the 
-            start of the text being matched if no previous match was found.&nbsp; This 
-            escape useful if you're iterating over the matches contained within a text, and 
-            you want each subsequence match to start where the last one ended.</P>
-         <H5>Quoting escape</H5>
-         <P>The escape sequence \Q begins a "quoted sequence": all the subsequent 
-            characters are treated as literals, until either the end of the regular 
-            expression or \E is found.&nbsp; For example the expression: \Q\*+\Ea+ would 
-            match either of:</P>
-         <PRE>\*+a<BR>\*+aaa</PRE>
-         <H5>Unicode escapes</H5>
-         <P>
-            <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\C</TD>
-                  <TD>Matches a single code point: in Boost regex this has exactly the same effect 
-                     as a "." operator.</TD>
-               </TR>
-               <TR>
-                  <TD>\X</TD>
-                  <TD>Matches a combining character sequence: that is any non-combining character 
-                     followed by a sequence of zero or more combining characters.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Any other escape</H5>
-         <P>Any other escape sequence matches the character that is escaped, for example \@ 
-            matches a literal <A href="mailto:'@'">'@'</A>.</P>
-      </BLOCKQUOTE><A name="variations">
-         <H4>Operator precedence</H4>
-         <P>&nbsp;The order of precedence for of operators is as shown in the following 
-            table:</P>
-         <P>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>Collation-related bracket symbols</TD>
-                  <TD>[==] [::] [..]</TD>
-               </TR>
-               <TR>
-                  <TD>Escaped characters
-                  </TD>
-                  <TD>\</TD>
-               </TR>
-               <TR>
-                  <TD>Character set&nbsp;(bracket expression)
-                  </TD>
-                  <TD>[]</TD>
-               </TR>
-               <TR>
-                  <TD>Grouping</TD>
-                  <TD>()</TD>
-               </TR>
-               <TR>
-                  <TD>Single-character-ERE duplication
-                  </TD>
-                  <TD>* + ? {m,n}</TD>
-               </TR>
-               <TR>
-                  <TD>Concatenation</TD>
-                  <TD></TD>
-               </TR>
-               <TR>
-                  <TD>Anchoring</TD>
-                  <TD>^$</TD>
-               </TR>
-               <TR>
-                  <TD>Alternation</TD>
-                  <TD>|</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </A>
-      <H4>What Gets Matched</H4>
-      <P>When there is more that one way to match a regular expression, the "best" 
-         possible match is obtained using the <A href="syntax_leftmost_longest.html">leftmost-longest 
-            rule</A>.</P>
-      <H3>Variations</H3>
-      <H4>Egrep<A name="egrep"></H4>
-      <P>When an expression is compiled with the flag <EM>egrep</EM> set, then the 
-         expression is treated as a newline separated list of POSIX-Extended 
-         expressions, a match is found if any of the expressions in the list match, for 
-         example:</P>
-      <PRE>boost::regex e("abc\ndef", boost::regex::egrep);</PRE>
-      <P>will match either of the POSIX-Basic expressions "abc" or "def".</P>
-      <P>As its name suggests, this behavior is consistent with the Unix utility <EM>egrep</EM>, 
-         and with <EM>grep</EM> when used with the -E option.</P>
-      <H4>awk<A name="awk"></A></H4>
-      <P>In addition to the <A href="#extended">POSIX-Extended features</A>&nbsp;the 
-         escape character is special inside a character class declaration.&nbsp;</P>
-      <P>In addition, some escape sequences that are not defined as part of 
-         POSIX-Extended specification are required to be supported - however Boost.Regex 
-         supports these by default anyway.</P>
-      <H3><A name="options"></A>Options</H3>
-      <P>There are a <A href="syntax_option_type.html#extended">variety of flags</A> that 
-         may be combined with the <EM>extended</EM> and <EM>egrep</EM> options when 
-         constructing the regular expression, in particular note that the <A href="syntax_option_type.html#extended">
-            newline_alt</A> option alters the syntax, while the <A href="syntax_option_type.html#extended">
-            collate, nosubs&nbsp;and icase</A> options modify how the case and locale 
-         sensitivity are to be applied.</P>
-      <H3><A name="refs">References</H3>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html"> IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions 
-            and Headers, Section 9, Regular Expressions.</A></P>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html"> IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-            Utilities, Section 4, Utilities, egrep.</A></P>
-      <P><A href="http://www.opengroup.org/onlinepubs/000095399/utilities/awk.html">IEEE 
-            Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-            Utilities, Section 4, Utilities, awk.</A></P>
-      <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21 Aug 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;2004</I></P>
-      <I>
-         <P><I>Use, modification and distribution are subject to the Boost Software License, 
-               Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-               or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>).</I></P>
-      </I>
-   </body>
-</html>
diff --git a/doc/syntax_extended.qbk b/doc/syntax_extended.qbk
new file mode 100644
index 00000000..103a0888
--- /dev/null
+++ b/doc/syntax_extended.qbk
@@ -0,0 +1,430 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:basic_extended POSIX Extended Regular Expression Syntax]
+
+[h3 Synopsis]
+
+The POSIX-Extended regular expression syntax is supported by the POSIX 
+C regular expression API's, and variations are used by the utilities 
+`egrep` and `awk`. You can construct POSIX extended regular expressions in 
+Boost.Regex by passing 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);
+
+[#boost_regex.posix_extended_syntax][h3 POSIX Extended Syntax]
+
+In POSIX-Extended regular expressions, all characters match themselves except for 
+the following special characters:
+
+[pre .\[{()\\\*+?|^$]
+
+[h4 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.
+
+[h4 Anchors:]
+
+A '^' character shall match the start of a line when used as the first 
+character of an expression, or the first character of a sub-expression.
+
+A '$' character shall match the end of a line when used as the 
+last character of an expression, or the last character of a sub-expression.
+
+[h4 Marked sub-expressions:]
+
+A section beginning `(` and ending `)` acts as a marked sub-expression.  
+Whatever matched the sub-expression is split out in a separate field 
+by the matching algorithms.  Marked sub-expressions can also repeated, 
+or referred to by a back-reference.
+
+[h4 Repeats:]
+
+Any atom (a single character, a marked sub-expression, or a character class) 
+can be repeated with the `*`, `+`, `?`, and `{}` operators.
+
+The `*` operator will match the preceding atom /zero or more times/, for 
+example the expression `a*b` will match any of the following:
+
+[pre
+b
+ab
+aaaaaaaab
+]
+
+The `+` operator will match the preceding atom /one or more times/, 
+for example the expression a+b will match any of the following:
+
+[pre 
+ab
+aaaaaaaab
+]
+
+But will not match:
+
+[pre
+b
+]
+
+The `?` operator will match the preceding atom /zero or one times/, for 
+example the expression `ca?b` will match any of the following:
+
+[pre
+cb
+cab
+]
+But will not match:
+
+[pre
+caab
+]
+
+An atom can also be repeated with a bounded repeat:
+
+`a{n}`  Matches 'a' repeated /exactly n times/.
+
+`a{n,}`  Matches 'a' repeated /n or more times/.
+
+`a{n, m}`  Matches 'a' repeated /between n and m times inclusive/.
+
+For example:
+
+[pre ^a{2,3}\$]
+
+Will match either of:
+
+   aa
+   aaa
+
+But neither of:
+
+   a
+   aaaa
+
+It is an error to use a repeat operator, if the preceding construct can not 
+be repeated, for example:
+
+   a(*)
+
+Will raise an error, as there is nothing for the `*` operator to be applied to.
+
+[h4 Back references:]
+
+An escape character followed by a digit /n/, where /n/ is in the range 1-9, 
+matches the same string that was matched by sub-expression /n/.  For example 
+the expression:
+
+[pre ^(a\*).\*\\1\$]
+
+Will match the string:
+
+   aaabbaaa
+
+But not the string:
+
+   aaabba
+
+[caution The POSIX standard does not support back-references for "extended" 
+regular expressions, this is a compatible extension to that standard.]
+
+[h4 Alternation]
+
+The `|` operator will match either of its arguments, so for example: 
+`abc|def` will match either "abc" or "def". 
+
+Parenthesis can be used to group alternations, for example: `ab(d|ef)` 
+will match either of "abd" or "abef".
+
+[h4 Character sets:]
+
+A character set is a bracket-expression starting with \[ and ending with \], 
+it defines a set of characters, and matches any single character that is 
+a member of that set.
+
+A bracket expression may contain any combination of the following:
+
+[h5 Single characters:]
+
+For example `[abc]`, will match any of the characters 'a', 'b', or 'c'.
+
+[h5 Character ranges:]
+
+For example `[a-c]` will match any single character in the range 'a' to 'c'.  
+By default, for POSIX-Extended regular expressions, a character /x/ is 
+within the range /y/ to /z/, if it collates within that range; this 
+results in locale specific behavior .  This behavior can be turned 
+off by unsetting the `collate` 
+[link boost_regex.ref.syntax_option_type option flag] - in which case whether 
+a character appears within a range is determined by comparing the code 
+points of the characters only.
+
+[h5 Negation:]
+
+If the bracket-expression begins with the ^ character, then it matches the 
+complement of the characters it contains, for example `[^a-c]` matches 
+any character that is not in the range `a-c`.
+
+[h5 Character classes:]
+
+An expression of the form `[[:name:]]` matches the named character class "name", 
+for example `[[:lower:]]` matches any lower case character.  
+See [link boost_regex.syntax.character_classes character class names].
+
+[h5 Collating Elements:]
+
+An expression of the form `[[.col.]` matches the collating element /col/.  
+A collating element is any single character, or any sequence of 
+characters that collates as a single unit.  Collating elements may 
+also be used as the end point of a range, for example: `[[.ae.]-c]` 
+matches the character sequence "ae", plus any single character 
+in the range "ae"-c, assuming that "ae" is treated as a single 
+collating element in the current locale.
+
+Collating elements may be used in place of escapes (which are not 
+normally allowed inside character sets), for example `[[.^.]abc]` 
+would match either one of the characters 'abc^'.
+
+As an extension, a collating element may also be specified via its 
+[link boost_regex.syntax.collating_names symbolic name], for example:
+
+   [[.NUL.]]
+
+matches a NUL character.
+
+[h5 Equivalence classes:]
+
+An expression of the form `[[=col=]]`, matches any character or collating element 
+whose primary sort key is the same as that for collating element /col/, 
+as with colating elements the name /col/ may be a 
+[link boost_regex.syntax.collating_names symbolic name].  A primary 
+sort key is one that ignores case, accentation, or locale-specific tailorings; 
+so for example `[[=a=]]` matches any of the characters: 
+a, '''&#xC0;''', '''&#xC1;''', '''&#xC2;''', 
+'''&#xC3;''', '''&#xC4;''', '''&#xC5;''', A, '''&#xE0;''', '''&#xE1;''', 
+'''&#xE2;''', '''&#xE3;''', '''&#xE4;''' and '''&#xE5;'''.  
+Unfortunately implementation of this is reliant on the platform's 
+collation and localisation support; this feature can not be relied 
+upon to work portably across all platforms, or even all locales on one platform.
+
+[h5 Combinations:]
+
+All of the above can be combined in one character set declaration, 
+for example: `[[:digit:]a-c[.NUL.]]`.
+
+[h4 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 `[\^]` will match either a literal '\\' or a '^'.
+
+However, that's rather restrictive, so the following standard-compatible 
+extensions are also supported by Boost.Regex:
+
+[h5 Escapes matching a specific character]
+
+The following escape sequences are all synonyms for single characters:
+
+[table
+[[Escape][Character]]
+[[\\a]['\\a']]
+[[\\e][0x1B]]
+[[\\f][\\f]]
+[[\\n][\\n]]
+[[\\r][\\r]]
+[[\\t][\\t]]
+[[\\v][\\v]]
+[[\\b][\\b (but only inside a character class declaration).]]
+[[\\cX][An ASCII escape sequence - the character whose code point is X % 32]]
+[[\\xdd][A hexadecimal escape sequence - matches the single character whose code point is 0xdd.]]
+[[\\x{dddd}][A hexadecimal escape sequence - matches the single character whose code point is 0xdddd.]]
+[[\\0ddd][An octal escape sequence - matches the single character whose code point is 0ddd.]]
+[[\\N{Name}][Matches the single character which has the symbolic name name.  For example `\\N{newline}` matches the single character \\n.]]
+]
+
+[h5 "Single character" character classes:]
+
+Any escaped character /x/, if /x/ is the name of a character class shall 
+match any character that is a member of that class, and any 
+escaped character /X/, if /x/ is the name of a character class, 
+shall match any character not in that class.
+
+The following are supported by default:
+
+[table
+[[Escape sequence][Equivalent to]]
+[[`\d`][`[[:digit:]]`]]
+[[`\l`][`[[:lower:]]`]]
+[[`\s`][`[[:space:]]`]]
+[[`\u`][`[[:upper:]]`]]
+[[`\w`][`[[:word:]]`]]
+[[`\D`][`[^[:digit:]]`]]
+[[`\L`][`[^[:lower:]]`]]
+[[`\S`][`[^[:space:]]`]]
+[[`\U`][`[^[:upper:]]`]]
+[[`\W`][`[^[:word:]]`]]
+]
+
+[h5 Character Properties]
+
+The character property names in the following table are all equivalent to the 
+names used in character classes.
+
+[table
+[[Form][Description][Equivalent character set form]]
+[[`\pX`][Matches any character that has the property X.][`[[:X:]]`]]
+[[`\p{Name}`][Matches any character that has the property Name.][`[[:Name:]]`]]
+[[`\PX`][Matches any character that does not have the property X.][`[^[:X:]]`]]
+[[`\P{Name}`][Matches any character that does not have the property Name.][`[^[:Name:]]`]]
+]
+
+For example `\pd` matches any "digit" character, as does `\p{digit}`.
+
+[h5 Word Boundaries]
+
+The following escape sequences match the boundaries of words:
+
+[table
+[[Escape][Meaning]]
+[[`\<`][Matches the start of a word.]]
+[[`\>`][Matches the end of a word.]]
+[[`\b`][Matches a word boundary (the start or end of a word).]]
+[[`\B`][Matches only when not at a word boundary.]]
+]
+
+[h5 Buffer boundaries]
+
+The following match only at buffer boundaries: a "buffer" in this 
+context is the whole of the input text that is being matched against 
+(note that ^ and $ may match embedded newlines within the text).
+
+[table
+[[Escape][Meaning]]
+[[\\\`][Matches at the start of a buffer only.]]
+[[\\'][Matches at the end of a buffer only.]]
+[[`\A`][Matches at the start of a buffer only (the same as \\\`).]]
+[[`\z`][Matches at the end of a buffer only (the same as \\').]]
+[[`\Z`][Matches an optional sequence of newlines at the end of a buffer: 
+equivalent to the regular expression `\n*\z`]]
+]
+
+[h5 Continuation Escape]
+
+The sequence `\G` matches only at the end of the last match found, or at 
+the start of the text being matched if no previous match was found.  
+This escape useful if you're iterating over the matches contained within 
+a text, and you want each subsequence match to start where the last one ended.
+
+[h5 Quoting escape]
+
+The escape sequence `\Q` begins a "quoted sequence": all the subsequent 
+characters are treated as literals, until either the end of the 
+regular expression or `\E` is found.  For example the expression: `\Q\*+\Ea+` 
+would match either of:
+
+   \*+a
+   \*+aaa
+
+[h5 Unicode escapes]
+
+[table
+[[Escape][Meaning]]
+[[`\C`][Matches a single code point: in Boost regex this has exactly the same effect as a "." operator.]]
+[[`\X`][Matches a combining character sequence: that is any non-combining character followed by a sequence of zero or more combining characters.]]
+]
+
+[h5 Any other escape]
+
+Any other escape sequence matches the character that is escaped, 
+for example \\@ matches a literal '@'.
+
+[h4 Operator precedence]
+
+The order of precedence for of operators is as follows:
+
+# Collation-related bracket symbols 	`[==] [::] [..]`
+# Escaped characters 	`\`
+# Character set (bracket expression) 	`[]`
+# Grouping 	`()`
+# Single-character-ERE duplication 	`* + ? {m,n}`
+# Concatenation 	
+# Anchoring 	^$
+# Alternation 	`|`
+
+[h4 What Gets Matched]
+
+When there is more that one way to match a regular expression, the 
+"best" possible match is obtained using the 
+[link boost_regex.syntax.leftmost_longest_rule leftmost-longest rule].
+
+[h3 Variations]
+
+[h4 Egrep]
+
+When an expression is compiled with the 
+[link boost_regex.ref.syntax_option_type flag `egrep`] set, then the 
+expression is treated as a newline separated list of 
+[link boost_regex.posix_extended_syntax POSIX-Extended expressions], 
+a match is found if any of the 
+expressions in the list match, for example:
+
+   boost::regex e("abc\ndef", boost::regex::egrep);
+
+will match either of the POSIX-Basic expressions "abc" or "def".
+
+As its name suggests, this behavior is consistent with the Unix utility `egrep`, 
+and with grep when used with the -E option.
+
+[h4 awk]
+
+In addition to the 
+[link boost_regex.posix_extended_syntax POSIX-Extended features] the 
+escape character is 
+special inside a character class declaration. 
+
+In addition, some escape sequences that are not defined as part of 
+POSIX-Extended specification are required to be supported - however Boost.Regex 
+supports these by default anyway.
+
+[h3 Options]
+
+There are a [link boost_regex.ref.syntax_option_type.syntax_option_type_extended variety of flags] 
+that may be combined with the `extended` and `egrep` options when 
+constructing the regular expression, in particular note that the 
+[link boost_regex.ref.syntax_option_type.syntax_option_type_extended `newline_alt`] 
+option alters the syntax, while the 
+[link boost_regex.ref.syntax_option_type.syntax_option_type_extended `collate`, `nosubs` 
+and `icase` options] modify how the case and locale sensitivity are to be applied.
+
+[h3 References]
+
+[@http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html 
+IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions and Headers, Section 9, Regular Expressions.]
+
+[@http://www.opengroup.org/onlinepubs/000095399/utilities/grep.html
+IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and Utilities, Section 4, Utilities, egrep.]
+
+[@http://www.opengroup.org/onlinepubs/000095399/utilities/awk.html 
+IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and Utilities, Section 4, Utilities, awk.]
+
+[endsect]
+
+
diff --git a/doc/syntax_leftmost_longest.html b/doc/syntax_leftmost_longest.html
deleted file mode 100644
index 6330fc5f..00000000
--- a/doc/syntax_leftmost_longest.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Index</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">The "Leftmost Longest" Rule</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>Often there is more than one way of matching a regular expression at a 
-         particular location, for POSIX basic and extended regular expressions, the 
-         "best" match is determined as follows:</P>
-      <OL>
-         <LI>
-            Find the leftmost match, if there is only one match possible at this location 
-            then return it.</LI>
-         <LI>
-            Find the longest of the possible matches, along with any ties.&nbsp; If there 
-            is only one such possible match then return it.</LI>
-         <LI>
-            If there are no marked sub-expressions, then all the remaining alternatives are 
-            indistinguishable; return the first of these found.</LI>
-         <LI>
-            Find the match which has matched the first sub-expression in the leftmost 
-            position, along with any ties.&nbsp; If there is only on such match possible 
-            then return it.</LI>
-         <LI>
-            Find the match which has the longest match for the first sub-expression, along 
-            with any ties.&nbsp; If there is only one such match then return it.</LI>
-         <LI>
-            Repeat steps 3 and 4 for each additional marked sub-expression.</LI>
-         <LI>
-            If there is still more than one possible match remaining, then they are 
-            indistinguishable; return the first one found.</LI></OL>
-      <P>
-         <HR>
-      <P></P>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         16 Dec 2004</p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/syntax_option_type.html b/doc/syntax_option_type.html
deleted file mode 100644
index fbd5cdbe..00000000
--- a/doc/syntax_option_type.html
+++ /dev/null
@@ -1,543 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: syntax_option_type</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">syntax_option_type</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="#perl">Options for Perl Regular Expressions</a> <dt><a href="#extended">Options 
-                              for POSIX Extended Regular Expressions</a> <dt><a href="#basic">Options for POSIX 
-                                 Basic Regular Expressions</a> <dt><a href="#literals">Options for String Literals</a></dt>
-                  </dl>
-               </dd>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>Type syntax_option type is an implementation specific bitmask type that 
-         controls how a regular expression string is to be interpreted.&nbsp; For 
-         convenience note that all the constants listed here, are also duplicated within 
-         the scope of class template <A href="basic_regex.html">basic_regex</A>.</P>
-      <PRE>namespace std{ namespace regex_constants{
-
-typedef <EM>implementation-specific-bitmask-type</EM> syntax_option_type;<BR>
-// 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;
-static const syntax_option_type perl = normal;<BR>static const syntax_option_type basic;
-static const syntax_option_type sed = basic;
-static const syntax_option_type extended;
-static const syntax_option_type awk;
-static const syntax_option_type grep;
-static const syntax_option_type egrep;
-static const syntax_option_type icase;
-static const syntax_option_type nosubs;
-static const syntax_option_type optimize;
-static const syntax_option_type collate;
-// other boost.regex specific options are listed below<BR>
-} // namespace regex_constants
-} // namespace std</PRE>
-      <H3><A name="description"></A>Description</H3>
-      <P>The type <CODE>syntax_option_type</CODE> is an implementation specific bitmask 
-         type (17.3.2.1.2). Setting its elements has the effects listed in the table 
-         below, a valid value of type <CODE>syntax_option_type</CODE> will always have 
-         exactly one of the elements <CODE>normal, basic, extended, awk, grep, egrep, sed, 
-            literal&nbsp;or perl</CODE> set.</P>
-      <P>Note that for convenience all the constants listed here are duplicated within 
-         the scope of class template basic_regex, so you can use any of:</P>
-      <PRE>boost::regex_constants::constant_name</PRE>
-      <P>or</P>
-      <PRE>boost::regex::constant_name</PRE>
-      <P>or</P>
-      <PRE>boost::wregex::constant_name</PRE>
-      <P>in an interchangeable manner.</P>
-      <H4><A name="perl"></A>Options for Perl Regular Expressions:</H4>
-      <P>One of the following must always be set for perl regular expressions:</P>
-      <P>
-         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>
-                  <P>ECMAScript</P>
-               </TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine uses its 
-                     normal semantics: that is the same as that given in the ECMA-262, ECMAScript 
-                     Language Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects 
-                     (FWD.1).</P>
-                  <P>boost.regex also recognizes all of the perl-compatible (?...) extensions in 
-                     this mode.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>perl</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-            <TR>
-               <TD>normal</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-            <TR>
-               <TD>JavaScript</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-            <TR>
-               <TD>JScript</TD>
-               <TD>No</TD>
-               <TD>As above.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be set when using perl-style regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>nosubs</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that when a regular expression is matched against a character 
-                     container sequence, then no sub-expression matches are to be stored in the 
-                     supplied match_results structure.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     Boost.Regex.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>collate</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>newline_alt</TD>
-               <TD>No</TD>
-               <TD>Specifies that the \n character has the same effect as the alternation 
-                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
-                  alternatives.</TD>
-            </TR>
-            <TR>
-               <TD>no_except</TD>
-               <TD>No</TD>
-               <TD>Prevents basic_regex from throwing an exception when an invalid expression is 
-                  encountered.</TD>
-            </TR>
-            <TR>
-               <TD>no_mod_m</TD>
-               <TD>No</TD>
-               <TD>Normally Boost.Regex behaves as if the Perl m-modifier is on: so the 
-                  assertions ^ and $ match after and before embedded newlines respectively, 
-                  setting this flags is equivalent to prefixing the expression with (?-m).</TD>
-            </TR>
-            <TR>
-               <TD>no_mod_s</TD>
-               <TD>No</TD>
-               <TD>Normally whether Boost.Regex will match "." against a newline character is 
-                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
-                  Specifying this flag is equivalent to prefixing the expression with (?-s) and 
-                  therefore causes "." not to match a newline character regardless of whether 
-                  match_not_dot_newline is set in the match flags.</TD>
-            </TR>
-            <TR>
-               <TD>mod_s</TD>
-               <TD>No</TD>
-               <TD>Normally whether Boost.Regex will match "." against a newline character is 
-                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
-                  Specifying this flag is equivalent to prefixing the expression with (?s) and 
-                  therefore causes "." to match a newline character regardless of whether 
-                  match_not_dot_newline is set in the match flags.</TD>
-            </TR>
-            <TR>
-               <TD>mod_x</TD>
-               <TD>No</TD>
-               <TD>Turns on the perl x-modifier: causes unescaped whitespace in the expression to 
-                  be ignored.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4><A name="extended"></A>Options for POSIX Extended Regular Expressions:</H4>
-      <P>Exactly one of the following must always be set for POSIX extended regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect when set</TD>
-            </TR>
-            <TR>
-               <TD>extended</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX extended regular expressions in IEEE Std 
-                     1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions and 
-                     Headers, Section 9, Regular Expressions (FWD.1).&nbsp;
-                  </P>
-                  <P>In addition some perl-style escape sequences are supported (The POSIX standard 
-                     specifies that only "special" characters may be escaped, all other escape 
-                     sequences result in undefined behavior).</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>egrep</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility grep when given the -E option in IEEE Std 
-                     1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-                     Utilities, Section 4, Utilities, grep (FWD.1).</P>
-                  <P>That is to say, the same as POSIX extended syntax, but with the newline 
-                     character acting as an alternation character in addition to "|".</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>awk</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility awk in IEEE Std 1003.1-2001, Portable 
-                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, awk 
-                     (FWD.1).</P>
-                  <P>That is to say: the same as POSIX extended syntax, but with escape sequences in 
-                     character classes permitted.</P>
-                  <P>In addition some perl-style escape sequences are supported (actually the awk 
-                     syntax only requires \a \b \t \v \f \n and \r to be recognised,&nbsp;all other 
-                     Perl-style escape sequences invoke undefined behavior according to the POSIX 
-                     standard, but are in fact recognised by Boost.Regex).</P>
-               </TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be set when using POSIX extended regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>nosubs</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that when a regular expression is matched against a character 
-                     container sequence, then no sub-expression matches are to be stored in the 
-                     supplied match_results structure.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     boost.regex.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>collate</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that character ranges of the form "[a-b]" should be locale 
-                     sensitive.&nbsp; <STRONG>This bit is</STRONG> <STRONG>on by default</STRONG> for 
-                     POSIX-Extended regular expressions, but can be unset to force ranges to be 
-                     compared by code point only.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>newline_alt</TD>
-               <TD>No</TD>
-               <TD>Specifies that the \n character has the same effect as the alternation 
-                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
-                  alternatives.</TD>
-            </TR>
-            <TR>
-               <TD>no_escape_in_lists</TD>
-               <TD>No</TD>
-               <TD>When set this makes the escape character ordinary inside lists, so that [\b] 
-                  would match either '\' or 'b'. <STRONG>This bit is one by default</STRONG> for 
-                  POSIX-Extended regular expressions, but can be unset to force escapes to be 
-                  recognised inside lists.</TD>
-            </TR>
-            <TR>
-               <TD>no_bk_refs</TD>
-               <TD>No</TD>
-               <TD>When set then backreferences are disabled.&nbsp; <STRONG>This bit is</STRONG> <STRONG>
-                     on by default</STRONG> for POSIX-Extended regular expressions, but can be 
-                  unset to support for backreferences on.</TD>
-            </TR>
-            <TR>
-               <TD>no_except</TD>
-               &nbsp;<TD>
-               <TD></TD>
-               <TD>No</TD>
-               <TD>Prevents basic_regex from throwing an exception when an invalid expression is 
-                  encountered.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4><A name="basic"></A>Options for POSIX Basic Regular Expressions:</H4>
-      <P>Exactly one of the following must always be set for POSIX basic regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table8" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect When Set</TD>
-            </TR>
-            <TR>
-               <TD>basic</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by <A href="syntax_basic.html#Basic">POSIX basic regular 
-                        expressions</A> in IEEE Std 1003.1-2001, Portable Operating System Interface 
-                     (POSIX ), Base Definitions and Headers, Section 9, Regular Expressions (FWD.1).
-                  </P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>sed</TD>
-               <TD>No</TD>
-               <TD>As Above.</TD>
-            </TR>
-            <TR>
-               <TD>grep</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by <A href="syntax_basic.html#grep">POSIX utility grep</A> in 
-                     IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
-                     Utilities, Section 4, Utilities, grep (FWD.1).</P>
-                  <P>That is to say, the same as POSIX basic syntax, but with the newline character 
-                     acting as an alternation character; the expression is treated as a newline 
-                     separated list of alternatives.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>emacs</TD>
-               <TD>No</TD>
-               <TD>Specifies that the grammar recognised is the superset of the POSIX-Basic 
-                  syntax used by the <A href="syntax_basic.html#emacs">emacs</A> program.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be set when using POSIX basic regular 
-         expressions:</P>
-      <P>
-         <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD><STRONG>Element</STRONG></TD>
-               <TD><STRONG>Standardized</STRONG></TD>
-               <TD><STRONG>Effect when set</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>nosubs</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that when a regular expression is matched against a character 
-                     container sequence, then no sub-expression matches are to be stored in the 
-                     supplied match_results structure.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     boost.regex.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>collate</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that character ranges of the form "[a-b]" should be locale 
-                     sensitive.&nbsp; <STRONG>This bit is</STRONG> <STRONG>on by default</STRONG> for 
-                     POSIX-Basic regular expressions, but can be unset to force ranges to be 
-                     compared by code point only.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>newline_alt</TD>
-               <TD>No</TD>
-               <TD>Specifies that the \n character has the same effect as the alternation 
-                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
-                  alternatives.&nbsp; This bit is already set, if you use the <EM>grep</EM> option.</TD>
-            </TR>
-            <TR>
-               <TD>no_char_classes</TD>
-               <TD>No</TD>
-               <TD>When set then character classes such as [[:alnum:]] are not allowed.</TD>
-            </TR>
-            <TR>
-               <TD>no_escape_in_lists</TD>
-               <TD>No</TD>
-               <TD>When set this makes the escape character ordinary inside lists, so that [\b] 
-                  would match either '\' or 'b'. <STRONG>This bit is one by default</STRONG> for 
-                  POSIX-basic regular expressions, but can be unset to force escapes to be 
-                  recognised inside lists.</TD>
-            </TR>
-            <TR>
-               <TD>no_intervals</TD>
-               <TD>No</TD>
-               <TD>When set then bounded repeats such as a{2,3} are not permitted.</TD>
-            </TR>
-            <TR>
-               <TD>bk_plus_qm</TD>
-               <TD>No</TD>
-               <TD>When set then \? acts as a zero-or-one repeat operator, and \+ acts as a 
-                  one-or-more repeat operator.</TD>
-            </TR>
-            <TR>
-               <TD>bk_vbar</TD>
-               <TD>No</TD>
-               <TD>When set then \| acts as the alternation operator.</TD>
-            </TR>
-            <TR>
-               <TD>no_except</TD>
-               <TD>
-               <TD></TD>
-               <TD>No</TD>
-               <TD>Prevents basic_regex from throwing an exception when an invalid expression is 
-                  encountered.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4><A name="literals"></A>Options for Literal Strings:</H4>
-      <P>The following must always be set to interpret the expression as a string 
-         literal:</P>
-      <P>
-         <TABLE id="Table10" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect when set</TD>
-            </TR>
-            <TR>
-               <TD>literal</TD>
-               <TD>Yes</TD>
-               <TD>Treat the string as a literal (no special characters).</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>The following options may also be combined with the <EM>literal</EM> flag:</P>
-      <P>
-         <TABLE id="Table11" cellSpacing="1" cellPadding="1" width="100%" border="1">
-            <TR>
-               <TD>Element</TD>
-               <TD>Standardized</TD>
-               <TD>Effect when set</TD>
-            </TR>
-            <TR>
-               <TD>icase</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that matching of regular expressions against a character container 
-                     sequence shall be performed without regard to case.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD>optimize</TD>
-               <TD>Yes</TD>
-               <TD>
-                  <P>Specifies that the regular expression engine should pay more attention to the 
-                     speed with which regular expressions are matched, and less to the speed with 
-                     which regular expression objects are constructed. Otherwise it has no 
-                     detectable effect on the program output.&nbsp; This currently has no effect for 
-                     boost.regex.</P>
-               </TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>&nbsp;</P>
-      <HR>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         23 June 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/syntax_option_type.qbk b/doc/syntax_option_type.qbk
new file mode 100644
index 00000000..6fca76f9
--- /dev/null
+++ b/doc/syntax_option_type.qbk
@@ -0,0 +1,300 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:syntax_option_type syntax_option_type]
+
+[section:syntax_option_type_synopsis syntax_option_type Synopsis]
+
+Type [syntax_option_type] is an implementation specific bitmask type 
+that controls how a regular expression string is to be interpreted.  
+For convenience note that all the constants listed here, are also 
+duplicated within the scope of class template [basic_regex].
+
+   namespace std{ namespace regex_constants{
+
+   typedef implementation-specific-bitmask-type syntax_option_type;
+
+   // 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;
+   static const syntax_option_type perl = normal;
+   static const syntax_option_type basic;
+   static const syntax_option_type sed = basic;
+   static const syntax_option_type extended;
+   static const syntax_option_type awk;
+   static const syntax_option_type grep;
+   static const syntax_option_type egrep;
+   static const syntax_option_type icase;
+   static const syntax_option_type nosubs;
+   static const syntax_option_type optimize;
+   static const syntax_option_type collate;
+   // other Boost.Regex specific options are listed below
+
+   } // namespace regex_constants
+   } // namespace std
+
+[endsect]
+
+[section:syntax_option_type_overview Overview of syntax_option_type]
+
+The type [syntax_option_type] is an implementation specific bitmask type 
+(see C++ standard 17.3.2.1.2). Setting its elements has the effects listed 
+in the table below, a valid value of type [syntax_option_type] will always 
+have exactly one of the elements `normal`, `basic`, `extended`, 
+`awk`, `grep`, `egrep`, `sed`, `literal` or `perl` set.
+
+Note that for convenience all the constants listed here are duplicated within 
+the scope of class template [basic_regex], so you can use any of:
+
+   boost::regex_constants::constant_name
+
+or
+
+   boost::regex::constant_name
+
+or
+
+   boost::wregex::constant_name
+
+in an interchangeable manner.
+
+[endsect]
+
+[section:syntax_option_type_perl Options for Perl Regular Expressions]
+
+One of the following must always be set for perl regular expressions:
+
+[table
+[[Element][Standardized][Effect when set]]
+[[ECMAScript][Yes][Specifies that the grammar recognized by the regular 
+      expression engine uses its normal semantics: that is the same as 
+      that given in the ECMA-262, ECMAScript Language Specification, 
+      Chapter 15 part 10, RegExp (Regular Expression) Objects (FWD.1).
+      
+      This is functionally identical to the 
+      [link boost_regex.syntax.perl_syntax Perl regular expression syntax].
+
+      Boost.Regex also recognizes all of the perl-compatible `(?...)` 
+      extensions in this mode.]]
+[[perl][No][As above.]]
+[[normal][No][As above.]]
+[[JavaScript][No][As above.]]
+[[JScript][No][As above.]]
+]
+
+The following options may also be set when using perl-style regular expressions:
+
+[table
+[[Element][Standardized][Effect when set]]
+[[icase][Yes][Specifies that matching of regular expressions against a 
+      character container sequence shall be performed without regard to case.]]
+[[nosubs][Yes][Specifies that when a regular expression is matched against 
+      a character container sequence, then no sub-expression matches are 
+      to be stored in the supplied [match_results] structure.]]
+[[optimize][Yes][Specifies that the regular expression engine should pay 
+      more attention to the speed with which regular expressions are matched, 
+      and less to the speed with which regular expression objects are 
+      constructed. Otherwise it has no detectable effect on the program output.  
+      This currently has no effect for Boost.Regex.]]
+[[collate][Yes][Specifies that character ranges of the form `[a-b]` should be 
+      locale sensitive.]]
+[[newline_alt][No][Specifies that the \\n character has the same effect as 
+      the alternation operator |.  Allows newline separated lists to be 
+      used as a list of alternatives.]]
+[[no_except][No][Prevents [basic_regex] from throwing an exception when an 
+      invalid expression is encountered.]]
+[[no_mod_m][No][Normally Boost.Regex behaves as if the Perl m-modifier is on: 
+      so the assertions ^ and $ match after and before embedded 
+      newlines respectively, setting this flags is equivalent to prefixing 
+      the expression with (?-m).]]
+[[no_mod_s][No][Normally whether Boost.Regex will match "." against a 
+      newline character is determined by the match flag `match_dot_not_newline`.  
+      Specifying this flag is equivalent to prefixing the expression with `(?-s)` 
+      and therefore causes "." not to match a newline character regardless of 
+      whether `match_not_dot_newline` is set in the match flags.]]
+[[mod_s][No][Normally whether Boost.Regex will match "." against a newline 
+      character is determined by the match flag `match_dot_not_newline`.  
+      Specifying this flag is equivalent to prefixing the expression with `(?s)` 
+      and therefore causes "." to match a newline character regardless of 
+      whether `match_not_dot_newline` is set in the match flags.]]
+[[mod_x][No][Turns on the perl x-modifier: causes unescaped whitespace 
+      in the expression to be ignored.]]
+]
+
+[endsect]
+
+[section:syntax_option_type_extended Options for POSIX Extended Regular Expressions]
+
+Exactly one of the following must always be set for 
+[link boost_regex.syntax.basic_extended POSIX extended 
+regular expressions]:
+
+[table
+[[Element][Standardized][Effect when set]]
+[[extended][Yes][Specifies that the grammar recognized by the regular 
+      expression engine is the same as that used by POSIX extended regular 
+      expressions in IEEE Std 1003.1-2001, Portable Operating System Interface 
+      (POSIX ), Base Definitions and Headers, Section 9, Regular Expressions (FWD.1). 
+      
+      Refer to the [link boost_regex.syntax.basic_extended POSIX extended 
+      regular expression guide] for more information.
+
+      In addition some perl-style escape sequences are supported 
+      (The POSIX standard specifies that only "special" characters may be 
+      escaped, all other escape sequences result in undefined behavior).]]
+[[egrep][Yes][Specifies that the grammar recognized by the regular expression 
+      engine is the same as that used by POSIX utility grep when given the 
+      -E option in IEEE Std 1003.1-2001, Portable Operating System 
+      Interface (POSIX ), Shells and Utilities, Section 4, Utilities, grep (FWD.1).
+
+      That is to say, the same as [link boost_regex.syntax.basic_extended 
+      POSIX extended syntax], but with the newline character acting as an 
+      alternation character in addition to "|".]]
+[[awk][Yes][Specifies that the grammar recognized by the regular 
+      expression engine is the same as that used by POSIX utility awk 
+      in IEEE Std 1003.1-2001, Portable Operating System Interface (POSIX ), 
+      Shells and Utilities, Section 4, awk (FWD.1).
+
+      That is to say: the same as [link boost_regex.syntax.basic_extended 
+      POSIX extended syntax], but with escape sequences in character 
+      classes permitted.
+
+      In addition some perl-style escape sequences are supported (actually 
+      the awk syntax only requires \\a \\b \\t \\v \\f \\n and \\r to be 
+      recognised, all other Perl-style escape sequences invoke undefined 
+      behavior according to the POSIX standard, but are in fact 
+      recognised by Boost.Regex).]]
+]
+
+The following options may also be set when using POSIX extended regular expressions:
+
+[table
+[[Element][Standardized][Effect when set]]
+[[icase][Yes][Specifies that matching of regular expressions against a 
+      character container sequence shall be performed without regard to case.]]
+[[nosubs][Yes][Specifies that when a regular expression is matched against a 
+      character container sequence, then no sub-expression matches are 
+      to be stored in the supplied [match_results] structure.]]
+[[optimize][Yes][Specifies that the regular expression engine should pay 
+      more attention to the speed with which regular expressions are matched, 
+      and less to the speed with which regular expression objects are 
+      constructed. Otherwise it has no detectable effect on the program output.  
+      This currently has no effect for Boost.Regex.]]
+[[collate][Yes][Specifies that character ranges of the form `[a-b]` should be 
+      locale sensitive.  This bit is on by default for POSIX-Extended 
+      regular expressions, but can be unset to force ranges to be compared 
+      by code point only.]]
+[[newline_alt][No][Specifies that the \\n character has the same effect as 
+      the alternation operator |.  Allows newline separated lists to be used 
+      as a list of alternatives.]]
+[[no_escape_in_lists][No][When set this makes the escape character ordinary 
+      inside lists, so that `[\b]` would match either '\\' or 'b'. This bit 
+      is on by default for POSIX-Extended regular expressions, but can be 
+      unset to force escapes to be recognised inside lists.]]
+[[no_bk_refs][No][When set then backreferences are disabled.  This bit is on 
+      by default for POSIX-Extended regular expressions, but can be unset 
+      to support for backreferences on.]]
+[[no_except][No][Prevents [basic_regex] from throwing an exception when 
+      an invalid expression is encountered.]]
+]
+
+[endsect]
+[section:syntax_option_type_basic Options for POSIX Basic Regular Expressions]
+
+Exactly one of the following must always be set for POSIX basic regular expressions:
+
+[table
+[[Element][Standardized][Effect When Set]]
+[[basic][Yes][Specifies that the grammar recognized by the regular expression 
+      engine is the same as that used by 
+      [link boost_regex.syntax.basic_syntax POSIX basic regular expressions] in IEEE Std 1003.1-2001, Portable 
+      Operating System Interface (POSIX ), Base Definitions and Headers, 
+      Section 9, Regular Expressions (FWD.1).]]
+[[sed][No][As Above.]]
+[[grep][Yes][Specifies that the grammar recognized by the regular 
+      expression engine is the same as that used by 
+      POSIX utility `grep` in IEEE Std 1003.1-2001, Portable Operating 
+      System Interface (POSIX ), Shells and Utilities, Section 4, 
+      Utilit\ies, grep (FWD.1).
+
+      That is to say, the same as [link boost_regex.syntax.basic_syntax 
+      POSIX basic syntax], but with the newline character acting as an 
+      alternation character; the expression is treated as a newline 
+      separated list of alternatives.]]
+[[emacs][No][Specifies that the grammar recognised is the superset of the 
+      [link boost_regex.syntax.basic_syntax POSIX-Basic syntax] used by 
+      the emacs program.]]
+]
+
+The following options may also be set when using POSIX basic regular expressions:
+
+[table
+[[Element][Standardized][Effect when set]]
+[[icase][Yes][Specifies that matching of regular expressions against a 
+      character container sequence shall be performed without regard to case.]]
+[[nosubs][Yes][Specifies that when a regular expression is matched against 
+      a character container sequence, then no sub-expression matches are 
+      to be stored in the supplied [match_results] structure.]]
+[[optimize][Yes][Specifies that the regular expression engine should pay 
+      more attention to the speed with which regular expressions are 
+      matched, and less to the speed with which regular expression objects 
+      are constructed. Otherwise it has no detectable effect on the program output.  
+      This currently has no effect for Boost.Regex.]]
+[[collate][Yes][Specifies that character ranges of the form `[a-b]` should 
+      be locale sensitive.  This bit is on by default for 
+      [link boost_regex.syntax.basic_syntax POSIX-Basic regular expressions], 
+      but can be unset to force ranges to be compared by code point only.]]
+[[newline_alt][No][Specifies that the \\n character has the same effect as the 
+      alternation operator |.  Allows newline separated lists to be used 
+      as a list of alternatives.  This bit is already set, if you use the 
+      `grep` option.]]
+[[no_char_classes][No][When set then character classes such as `[[:alnum:]]` 
+      are not allowed.]]
+[[no_escape_in_lists][No][When set this makes the escape character ordinary 
+      inside lists, so that `[\b]` would match either '\\' or 'b'. This bit 
+      is on by default for [link boost_regex.syntax.basic_syntax POSIX-basic 
+      regular expressions], but can be unset to force escapes to be recognised 
+      inside lists.]]
+[[no_intervals][No][When set then bounded repeats such as a{2,3} are not permitted.]]
+[[bk_plus_qm][No][When set then `\?` acts as a zero-or-one repeat operator, 
+      and `\+` acts as a one-or-more repeat operator.]]
+[[bk_vbar][No][When set then `\|` acts as the alternation operator.]]
+[[no_except][No][Prevents [basic_regex] from throwing an exception when an 
+      invalid expression is encountered.]]
+]
+
+[endsect]
+
+[section:syntax_option_type_literal Options for Literal Strings]
+
+The following must always be set to interpret the expression as a string literal:
+
+[table
+[[Element][Standardized][Effect when set]]
+[[literal][Yes][Treat the string as a literal (no special characters).]]
+]
+
+The following options may also be combined with the literal flag:
+
+[table
+[[Element][Standardized][Effect when set]]
+[[icase][Yes][Specifies that matching of regular expressions against a 
+      character container sequence shall be performed without regard to case.]]
+[[optimize][Yes][Specifies that the regular expression engine should pay 
+      more attention to the speed with which regular expressions are matched, 
+      and less to the speed with which regular expression objects are constructed. 
+      Otherwise it has no detectable effect on the program output.  This 
+      currently has no effect for Boost.Regex.]]
+]
+
+[endsect]
+
+[endsect]
+
diff --git a/doc/syntax_perl.html b/doc/syntax_perl.html
deleted file mode 100644
index 3eda0385..00000000
--- a/doc/syntax_perl.html
+++ /dev/null
@@ -1,626 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Perl Regular Expression Syntax</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td vAlign="top" width="300">
-                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../boost.png" width="277" border="0"></A></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">
-                     Perl&nbsp;Regular Expression Syntax</H2>
-               </TD>
-               <td width="50">
-                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <H3>Contents</H3>
-      <dl class="index">
-         <dt><A href="#synopsis">Synopsis</A> <dt><A href="#Perl">Perl&nbsp;Syntax</A> <dt><A href="#what">
-                     What Gets Matched</A> <dt><A href="#variations">Variations</A>
-                     <dd>
-                        <dt><A href="#options">Options</A> <dt><A href="#mods">Modifiers</A> <dt><A href="#refs">References</A></dt>
-      </dl>
-      <H3><A name="synopsis"></A>Synopsis</H3>
-      <P>The Perl regular expression syntax is based on that used by the programming 
-         language <EM>Perl</EM> .&nbsp; Perl regular expressions are the default 
-         behavior in Boost.Regex or you can&nbsp;pass the flag <EM>perl</EM> to the 
-         regex constructor, for example:</P>
-      <PRE>// 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);</PRE>
-      <H3>Perl&nbsp;Regular Expression Syntax<A name="Perl"></A></H3>
-      <P>In&nbsp;Perl regular expressions, all characters match themselves except for 
-         the following special characters:</P>
-      <PRE>.[{()\*+?|^$</PRE>
-      <H4>Wildcard:</H4>
-      <P>The single character '.' when used outside of a character set will match any 
-         single character except:</P>
-      <P>The NULL character when the flag <EM>match_no_dot_null</EM> is passed to the 
-         matching algorithms.</P>
-      <P>The newline character when the flag <EM>match_not_dot_newline</EM> is passed to 
-         the matching algorithms.</P>
-      <H4>Anchors:</H4>
-      <P>A '^' character shall match the start of a line.</P>
-      <P>A '$' character shall match the end of a line.</P>
-      <H4>Marked sub-expressions:</H4>
-      <P>A section beginning ( and ending ) acts as a marked sub-expression.&nbsp; 
-         Whatever matched the sub-expression is split out in a separate field by the 
-         matching algorithms.&nbsp; Marked sub-expressions can also repeated, or 
-         referred to by a back-reference.</P>
-      <H4>Non-marking grouping:</H4>
-      <P>A marked sub-expression is useful to lexically group part of a regular 
-         expression, but has the side-effect of spitting out an extra field in the 
-         result.&nbsp; As an alternative&nbsp;you can lexically group part of a regular 
-         expression, without generating a marked sub-expression by using (?: and ) , for 
-         example (?:ab)+ will repeat "ab" without splitting out any separate 
-         sub-expressions.</P>
-      <H4>Repeats:</H4>
-      <P>Any atom (a single character, a marked sub-expression, or a character class) 
-         can be repeated with the *, +, ?, and {}&nbsp;operators.</P>
-      <P>The * operator will match the preceding atom zero or more times, for example 
-         the expression a*b will match any of the following:</P>
-      <PRE>b
-ab
-aaaaaaaab</PRE>
-      <P>The + operator will match the preceding atom one or more times, for example the 
-         expression a+b will match any of the following:</P>
-      <PRE>ab
-aaaaaaaab</PRE>
-      <P>But will not match:</P>
-      <PRE>b</PRE>
-      <P>The ? operator will match the preceding atom zero or&nbsp;one times, for 
-         example the expression ca?b will match any of the following:</P>
-      <PRE>cb
-cab</PRE>
-      <P>But will not match:</P>
-      <PRE>caab</PRE>
-      <P>An atom can also be repeated with a bounded repeat:</P>
-      <P>a{n}&nbsp; Matches 'a' repeated exactly <EM>n</EM> times.</P>
-      <P>a{n,}&nbsp; Matches 'a' repeated <EM>n</EM> or more times.</P>
-      <P>a{n, m}&nbsp; Matches 'a' repeated between <EM>n</EM> and <EM>m</EM> times 
-         inclusive.</P>
-      <P>For example:</P>
-      <PRE>^a{2,3}$</PRE>
-      <P>Will match either of:</P>
-      <PRE>aa
-aaa</PRE>
-      <P>But neither of:</P>
-      <PRE>a
-aaaa</PRE>
-      <P>It is an error to use a repeat operator, if the preceding construct can not be 
-         repeated, for example:</P>
-      <PRE>a(*)</PRE>
-      <P>Will raise an error, as there is nothing for the * operator to be applied to.</P>
-      <H4>Non greedy repeats</H4>
-      <P>The normal repeat operators are "greedy", that is to say they will consume as 
-         much input as possible.&nbsp; There are non-greedy versions available that will 
-         consume as little input as possible while still producing a match.</P>
-      <P>*? Matches the previous atom zero or more times, while consuming as little 
-         input as possible.</P>
-      <P>+? Matches the previous atom one or more times, while consuming as little input 
-         as possible.</P>
-      <P>?? Matches the previous atom zero or one times, while consuming as little input 
-         as possible.</P>
-      <P>{n,}? Matches the previous atom <EM>n</EM> or more times, while&nbsp;consuming 
-         as little input as possible.</P>
-      <P>{n,m}? Matches the previous atom between <EM>n</EM> and <EM>m</EM> times, 
-         while&nbsp;consuming as little input as possible.</P>
-      <H4>Back references:</H4>
-      <P>An escape character followed by a digit <EM>n</EM>, where <EM>n </EM>is in the 
-         range 1-9, matches the same string that was matched by sub-expression <EM>n</EM>.&nbsp; 
-         For example the expression:</P>
-      <PRE>^(a*).*\1$</PRE>
-      <P>Will match the string:</P>
-      <PRE>aaabbaaa</PRE>
-      <P>But not the string:</P>
-      <PRE>aaabba</PRE>
-      <H4>Alternation</H4>
-      <P>The | operator will match either of its arguments, so for example: abc|def will 
-         match either "abc" or "def".&nbsp;
-      </P>
-      <P>Parenthesis can be used to group alternations, for example: ab(d|ef) will match 
-         either of "abd" or "abef".</P>
-      <P>Empty&nbsp;alternatives are not allowed (these are almost always a mistake), 
-         but if you really want an empty alternative use (?:) as a placeholder, for 
-         example:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <P>"|abc" is not a valid expression, but<BR>
-            "(?:)|abc" is and is equivalent, also the expression:<BR>
-            "(?:abc)??" has exactly the same effect.</P>
-      </BLOCKQUOTE>
-      <H4>Character sets:</H4>
-      <P>A character set is a bracket-expression starting with [ and ending with ], it 
-         defines a set of characters, and matches any single character that is a member 
-         of that set.</P>
-      <P>A bracket expression may contain any combination of the following:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Single characters:</H5>
-         <P>For example [abc], will match any of the characters 'a', 'b', or 'c'.</P>
-         <H5>Character ranges:</H5>
-         <P>For example [a-c] will match any single character in the range 'a' to 
-            'c'.&nbsp; By default, for POSIX-Perl regular expressions, a character <EM>x</EM>
-            is within the range <EM>y</EM> to <EM>z</EM>, if it collates within that 
-            range;&nbsp;this results in locale specific behavior.&nbsp; This behavior can 
-            be turned off by unsetting the <EM><A href="syntax_option_type.html#Perl">collate</A></EM>
-            option flag - in which case whether a character appears within a range is 
-            determined by comparing the code points of the characters only</P>
-         <H5>Negation:</H5>
-         <P>If the bracket-expression begins with the ^ character, then it matches the 
-            complement of the characters it contains, for example [^a-c] matches any 
-            character that is not in the range a-c.</P>
-         <H5>Character classes:</H5>
-         <P>An expression of the form [[:name:]] matches the named character class "name", 
-            for example [[:lower:]] matches any lower case character.&nbsp; See <A href="character_class_names.html">
-               character class names</A>.</P>
-         <H5>Collating Elements:</H5>
-         <P>An expression of the form [[.col.] matches the collating element <EM>col</EM>.&nbsp; 
-            A collating element is any single character, or any sequence of characters that 
-            collates as a single unit.&nbsp; Collating elements may also be used as the end 
-            point of a range, for example: [[.ae.]-c] matches the character sequence "ae", 
-            plus any single character in the range "ae"-c, assuming that "ae" is treated as 
-            a single collating element in the current locale.</P>
-         <P>As an extension, a collating element may also be specified via it's <A href="collating_names.html">
-               symbolic name</A>, for example:</P>
-         <P>[[.NUL.]]</P>
-         <P>matches a NUL character.</P>
-         <H5>Equivalence classes:</H5>
-         <P>
-            An expression oftheform[[=col=]], matches any character or collating element 
-            whose primary sort key is the same as that for collating element <EM>col</EM>, 
-            as with colating elements the name <EM>col</EM> may be a <A href="collating_names.html">
-               symbolic name</A>.&nbsp; A primary sort key is one that ignores case, 
-            accentation, or locale-specific tailorings; so for example [[=a=]] matches any 
-            of the characters: a, à, á, â, ã, ä, å, A, À, Á, Â, Ã, Ä and Å.&nbsp; 
-            Unfortunately implementation of this is reliant on the platform's collation and 
-            localisation support; this feature can not be relied upon to work portably 
-            across all platforms, or even all locales on one platform.</P>
-         <H5>Escapes:</H5>
-         <P>All the escape sequences that match a single character, or a single character 
-            class are permitted within a character class definition, <EM>except</EM> the 
-            negated character classes (\D \W etc).</P>
-      </BLOCKQUOTE>
-      <H5>Combinations:</H5>
-      <P>All of the above can be combined in one character set declaration, for example: 
-         [[:digit:]a-c[.NUL.]].</P>
-      <H4>Escapes</H4>
-      <P>Any special character preceded by an escape shall match itself.
-      </P>
-      <P>The following escape sequences are also supported:</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5>Escapes matching a specific character</H5>
-         <P>The following escape sequences are all synonyms for single characters:</P>
-         <P>
-            <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD><STRONG>Escape</STRONG></TD>
-                  <TD><STRONG>Character</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\a</TD>
-                  <TD>'\a'</TD>
-               </TR>
-               <TR>
-                  <TD>\e</TD>
-                  <TD>0x1B</TD>
-               </TR>
-               <TR>
-                  <TD>\f</TD>
-                  <TD>\f</TD>
-               </TR>
-               <TR>
-                  <TD>\n</TD>
-                  <TD>\n</TD>
-               </TR>
-               <TR>
-                  <TD>\r</TD>
-                  <TD>\r</TD>
-               </TR>
-               <TR>
-                  <TD>\t</TD>
-                  <TD>\t</TD>
-               </TR>
-               <TR>
-                  <TD>\v</TD>
-                  <TD>\v</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>\b (but only inside a character class declaration).</TD>
-               </TR>
-               <TR>
-                  <TD>\cX</TD>
-                  <TD>An ASCII escape sequence - the character whose code point is X % 32</TD>
-               </TR>
-               <TR>
-                  <TD>\xdd</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdd.</TD>
-               </TR>
-               <TR>
-                  <TD>\x{dddd}</TD>
-                  <TD>A hexadecimal escape sequence - matches the single character whose code point 
-                     is 0xdddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\0ddd</TD>
-                  <TD>An octal escape sequence - matches the single character whose code point is 
-                     0ddd.</TD>
-               </TR>
-               <TR>
-                  <TD>\N{name}</TD>
-                  <TD>Matches the single character which has the <A href="collating_names.html">symbolic 
-                        name</A> <EM>name.&nbsp; </EM>For example \N{newline} matches the single 
-                     character \n.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>"Single character" character&nbsp;classes:</H5>
-         <P>Any escaped character <EM>x</EM>, if <EM>x</EM> is the name of a character 
-            class shall match any character that is a member of that class, and any escaped 
-            character <EM>X</EM>, if <EM>x</EM> is the name of a character class, shall 
-            match any character not in that class.</P>
-         <P>The following are supported by default:</P>
-         <P>
-            <TABLE id="Table3" cellSpacing="1" cellPadding="1" width="300" border="1">
-               <TR>
-                  <TD><STRONG>Escape sequence</STRONG></TD>
-                  <TD><STRONG>Equivalent to</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\d</TD>
-                  <TD>[[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\l</TD>
-                  <TD>[[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\s</TD>
-                  <TD>[[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\u</TD>
-                  <TD>[[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\w</TD>
-                  <TD>[[:word:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\D</TD>
-                  <TD>[^[:digit:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\L</TD>
-                  <TD>[^[:lower:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\S</TD>
-                  <TD>[^[:space:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\U</TD>
-                  <TD>[^[:upper:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\W</TD>
-                  <TD>[^[:word:]]</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Character Properties</H5>
-         <P>The character property names in the following table are all equivalent to the <A href="character_class_names.html">
-               names used in character classes</A>.</P>
-         <P>
-            <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="0">
-               <TR>
-                  <TD><STRONG>Form</STRONG></TD>
-                  <TD><STRONG>Description</STRONG></TD>
-                  <TD><STRONG>Equivalent character set form</STRONG></TD>
-               </TR>
-               <TR>
-                  <TD>\pX</TD>
-                  <TD>Matches any character that has the property X.</TD>
-                  <TD>[[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\p{Name}</TD>
-                  <TD>Matches any character that has the property <EM>Name</EM>.</TD>
-                  <TD>[[:Name:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\PX</TD>
-                  <TD>Matches any character that does not have the property X.</TD>
-                  <TD>[^[:X:]]</TD>
-               </TR>
-               <TR>
-                  <TD>\P{Name}</TD>
-                  <TD>Matches any character that does not have the property <EM>Name</EM>.</TD>
-                  <TD>[^[:Name:]]</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Word Boundaries</H5>
-         <P>The following escape sequences match the boundaries of words:</P>
-         <P>
-            <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\&lt;</TD>
-                  <TD>Matches the start of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\&gt;</TD>
-                  <TD>Matches the end of a word.</TD>
-               </TR>
-               <TR>
-                  <TD>\b</TD>
-                  <TD>Matches a word boundary (the start or end of a word).</TD>
-               </TR>
-               <TR>
-                  <TD>\B</TD>
-                  <TD>Matches only when not at a word boundary.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Buffer boundaries</H5>
-         <P>The following match only at buffer boundaries: a "buffer" in this context is 
-            the whole of the input text&nbsp;that is being matched against (note that ^ and 
-            $ may match embedded newlines within the text).</P>
-         <P>
-            <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\`</TD>
-                  <TD>Matches at the start of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\'</TD>
-                  <TD>Matches at the end of a buffer only.</TD>
-               </TR>
-               <TR>
-                  <TD>\A</TD>
-                  <TD>Matches at the start of a buffer only (the same as \`).</TD>
-               </TR>
-               <TR>
-                  <TD>\z</TD>
-                  <TD>Matches at the end of a buffer only (the same as \').</TD>
-               </TR>
-               <TR>
-                  <TD>\Z</TD>
-                  <TD>Matches an optional sequence of newlines at the end of a buffer: equivalent to 
-                     the regular expression \n*\z</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Continuation Escape</H5>
-         <P>The sequence \G matches only at the end of the last match found, or at the 
-            start of the text being matched if no previous match was found.&nbsp; This 
-            escape useful if you're iterating over the matches contained within a text, and 
-            you want each subsequence match to start where the last one ended.</P>
-         <H5>Quoting escape</H5>
-         <P>The escape sequence \Q begins a "quoted sequence": all the subsequent 
-            characters are treated as literals, until either the end of the regular 
-            expression or \E is found.&nbsp; For example the expression: \Q\*+\Ea+ would 
-            match either of:</P>
-         <PRE>\*+a<BR>\*+aaa</PRE>
-         <H5>Unicode escapes</H5>
-         <P>
-            <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>\C</TD>
-                  <TD>Matches a single code point: in Boost regex this has exactly the same effect 
-                     as a "." operator.</TD>
-               </TR>
-               <TR>
-                  <TD>\X</TD>
-                  <TD>Matches a combining character sequence: that is any non-combining character 
-                     followed by a sequence of zero or more combining characters.</TD>
-               </TR>
-            </TABLE>
-         </P>
-         <H5>Any other escape</H5>
-         <P>Any other escape sequence matches the character that is escaped, for example \@ 
-            matches a literal <A href="mailto:'@'">'@'</A>.</P>
-      </BLOCKQUOTE>
-      <H4 dir="ltr">Perl Extended Patterns</H4>
-      <P dir="ltr">Perl-specific extensions to the regular expression syntax all start 
-         with (?.</P>
-      <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-         <H5 dir="ltr">Comments</H5>
-         <P dir="ltr">(?# ... ) is treated as a comment, it's contents are ignored.</P>
-         <H5 dir="ltr">Modifiers</H5>
-         <P dir="ltr">(?imsx-imsx ... ) alters which of the perl modifiers are in effect 
-            within the pattern, changes take effect from the point that the block is first 
-            seen and extend to any enclosing ).&nbsp; Letters before a '-' turn that perl 
-            modifier on, letters afterward, turn it off.</P>
-         <P dir="ltr">(?imsx-imsx:pattern) applies the specified modifiers to <EM>pattern</EM>
-            only.</P>
-         <H5 dir="ltr">Non-marking grouping</H5>
-         <P dir="ltr">(?:pattern) lexically groups <EM>pattern</EM>, without generating an 
-            additional sub-expression.</P>
-         <H5 dir="ltr">Lookahead</H5>
-         <P dir="ltr">(?=pattern) consumes zero characters, only if <EM>pattern</EM> matches.</P>
-         <P dir="ltr">(?!pattern) consumes zero characters, only if <EM>pattern</EM> does 
-            not match.</P>
-         <P dir="ltr">Lookahead is typically used to create the logical AND of two regular 
-            expressions, for example if a password must contain a lower case letter, an 
-            upper case letter, a punctuation symbol, and be at least 6 characters long, 
-            then the expression:</P>
-         <PRE dir="ltr">(?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}</PRE>
-         <P dir="ltr">could be used to validate the password.</P>
-         <H5 dir="ltr">Lookbehind</H5>
-         <P dir="ltr">(?&lt;=pattern) consumes zero characters, only if <EM>pattern</EM> could 
-            be matched against the characters preceding the current position (<EM>pattern</EM>
-            must be of fixed length).</P>
-         <P dir="ltr">(?&lt;!pattern) consumes zero characters, only if <EM>pattern</EM> could 
-            not be matched against the characters preceding the current position (<EM>pattern</EM>
-            must be of fixed length).</P>
-         <H5 dir="ltr">Independent sub-expressions</H5>
-         <P dir="ltr">(?&gt;pattern) <EM>pattern</EM> is matched independently of the 
-            surrounding patterns, the expression will never backtrack into <EM>pattern</EM>.&nbsp; 
-            Independent sub-expressions are typically used to improve performance; only the 
-            best possible match for <EM>pattern</EM> will be considered, if this doesn't 
-            allow the expression as a whole to match then no match is found at all.</P>
-         <H5 dir="ltr">Conditional Expressions</H5>
-         <P dir="ltr">(?(condition)yes-pattern|no-pattern) attempts to match <EM>yes-pattern</EM>
-            if the <EM>condition </EM>is true, otherwise attempts to match <EM>no-pattern</EM>.</P>
-         <P dir="ltr">(?(condition)yes-pattern) attempts to match <EM>yes-pattern</EM> if 
-            the <EM>condition </EM>is true, otherwise fails.</P>
-         <P dir="ltr"><EM>Condition</EM> may be either a forward lookahead assert, or the 
-            index of a marked sub-expression (the condition becomes true if the 
-            sub-expression has been matched).</P>
-      </BLOCKQUOTE><A name="what">
-         <H4>Operator precedence</H4>
-         <P>&nbsp;The order of precedence for of operators is as shown in the following 
-            table:</P>
-         <P>
-            <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
-               <TR>
-                  <TD>Collation-related bracket symbols</TD>
-                  <TD>[==] [::] [..]</TD>
-               </TR>
-               <TR>
-                  <TD>Escaped characters
-                  </TD>
-                  <TD>\</TD>
-               </TR>
-               <TR>
-                  <TD>Character set&nbsp;(bracket expression)
-                  </TD>
-                  <TD>[]</TD>
-               </TR>
-               <TR>
-                  <TD>Grouping</TD>
-                  <TD>()</TD>
-               </TR>
-               <TR>
-                  <TD>Single-character-ERE duplication
-                  </TD>
-                  <TD>* + ? {m,n}</TD>
-               </TR>
-               <TR>
-                  <TD>Concatenation</TD>
-                  <TD></TD>
-               </TR>
-               <TR>
-                  <TD>Anchoring</TD>
-                  <TD>^$</TD>
-               </TR>
-               <TR>
-                  <TD>Alternation</TD>
-                  <TD>|</TD>
-               </TR>
-            </TABLE>
-         </P>
-      </A>
-      <H3>What gets matched</H3>
-      <P>If you view the regular expression as a directed (possibly cyclic) graph, then 
-         the best match found is the first match found by a depth-first-search performed 
-         on that graph, while matching the input text.</P>
-      <P>Alternatively:</P>
-      <P>the best match found is the leftmost match, with individual elements matched as 
-         follows;</P>
-      <P>
-         <TABLE id="Table8" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <TD><STRONG>Construct</STRONG></TD>
-               <TD><STRONG>What gets matches</STRONG></TD>
-            </TR>
-            <TR>
-               <TD>AtomA AtomB</TD>
-               <TD>Locates the best match for AtomA that has a following match for&nbsp;AtomB.</TD>
-            </TR>
-            <TR>
-               <TD>Expression1 | Expression2</TD>
-               <TD>If Expresion1 can be matched then returns that match, otherwise attempts to 
-                  match Expression2.</TD>
-            </TR>
-            <TR>
-               <TD>S{N}</TD>
-               <TD>Matches S repeated exactly N times.</TD>
-            </TR>
-            <TR>
-               <TD>S{N,M}</TD>
-               <TD>Matches S repeated between N and M times, and as many times as possible.</TD>
-            </TR>
-            <TR>
-               <TD>S{N,M}?</TD>
-               <TD>Matches S repeated between N and M times, and as few times as possible.</TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> S?, S*, S+</TD>
-               <TD><!--StartFragment --> The same as <CODE>S{0,1}</CODE>, <CODE>S{0,UINT_MAX}</CODE>,
-                  <CODE>S{1,UINT_MAX}</CODE> respectively.
-               </TD>
-            </TR>
-            <TR>
-               <TD>S??, S*?, S+?</TD>
-               <TD>The same as <CODE>S{0,1}?</CODE>, <CODE>S{0,UINT_MAX}?</CODE>, <CODE>S{1,UINT_MAX}?</CODE>
-                  respectively.
-               </TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> (?&gt;S)
-               </TD>
-               <TD>Matches the best match for S, and only that.</TD>
-            </TR>
-            <TR>
-               <TD>
-                  (?=S), (?&lt;=S)
-               </TD>
-               <TD>Matches only the best match for S (this is only visible if there are capturing 
-                  parenthesis within S).</TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> (?!S), (?&lt;!S)</TD>
-               <TD>Considers only whether a match for S exists or not.</TD>
-            </TR>
-            <TR>
-               <TD><!--StartFragment --> (?(condition)yes-pattern | no-pattern)</TD>
-               <TD>If condition is <EM>true</EM>, then only <EM>yes-pattern</EM> is considered, 
-                  otherwise only <EM>no-pattern</EM> is considered.</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3><A name="variations"></A>Variations</H3>
-      <P>The options <A href="syntax_option_type.html#perl"><EM>normal, ECMAScript, JavaScript</EM>
-            and <EM>JScript</EM></A> are all synonyms for <EM>Perl</EM>.</P>
-      <H3><A name="options"></A>Options</H3>
-      <P>There are a <A href="syntax_option_type.html#Perl">variety of flags</A> that 
-         may be combined with the <EM>Perl</EM> option when constructing the regular 
-         expression, in particular note that the <A href="syntax_option_type.html#Perl">newline_alt</A>
-         option alters the syntax, while the <A href="syntax_option_type.html#Perl">collate, 
-            nosubs&nbsp;and icase</A> options modify how the case and locale sensitivity 
-         are to be applied.</P>
-      <H3><A name="mods"></A>Modifiers</H3>
-      <P>The perl <EM>smix</EM> modifiers can either be applied using a (?smix-smix) 
-         prefix to the regular expression, or with one of the regex-compile time flags <EM><A href="syntax_option_type.html#Perl">
-               no_mod_m, mod_x, mod_s, and no_mod_s</A></EM>.
-      </P>
-      <H3><A name="refs">References</H3>
-      <P><A href="http://perldoc.perl.org/perlre.html"> Perl 5.8.</A></P>
-      <HR>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         21 Aug 2004&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;2004</I></P>
-      <I>
-         <P><I>Use, modification and distribution are subject to the Boost Software License, 
-               Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-               or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>).</I></P>
-      </I>
-   </body>
-</html>
diff --git a/doc/syntax_perl.qbk b/doc/syntax_perl.qbk
new file mode 100644
index 00000000..916ed018
--- /dev/null
+++ b/doc/syntax_perl.qbk
@@ -0,0 +1,516 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:perl_syntax Perl Regular Expression Syntax]
+
+[h3 Synopsis]
+
+The Perl regular expression syntax is based on that used by the 
+programming 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);
+
+[h3 Perl Regular Expression Syntax]
+
+In Perl regular expressions, all characters match themselves except for the 
+following special characters:
+
+[pre .\[{()\\\*+?|^$]
+
+[h4 Wildcard]
+
+The single character '.' when used outside of a character set will match 
+any single character except:
+
+* The NULL character when the [link boost_regex.ref.match_flag_type flag 
+   `match_no_dot_null`] is passed to the matching algorithms.
+* The newline character when the [link boost_regex.ref.match_flag_type 
+   flag `match_not_dot_newline`] is passed to 
+   the matching algorithms.
+   
+[h4 Anchors]
+
+A '^' character shall match the start of a line.
+
+A '$' character shall match the end of a line.
+
+[h4 Marked sub-expressions]
+
+A section beginning `(` and ending `)` acts as a marked sub-expression.  
+Whatever matched the sub-expression is split out in a separate field by 
+the matching algorithms.  Marked sub-expressions can also repeated, or 
+referred to by a back-reference.
+
+[h4 Non-marking grouping]
+
+A marked sub-expression is useful to lexically group part of a regular 
+expression, but has the side-effect of spitting out an extra field in 
+the result.  As an alternative you can lexically group part of a 
+regular expression, without generating a marked sub-expression by using 
+`(?:` and `)` , for example `(?:ab)+` will repeat `ab` without splitting 
+out any separate sub-expressions.
+
+[h4 Repeats]
+
+Any atom (a single character, a marked sub-expression, or a character class) 
+can be repeated with the `*`, `+`, `?`, and `{}` operators.
+
+The `*` operator will match the preceding atom zero or more times, 
+for example the expression `a*b` will match any of the following:
+
+   b
+   ab
+   aaaaaaaab
+
+The `+` operator will match the preceding atom one or more times, for 
+example the expression `a+b` will match any of the following:
+
+   ab
+   aaaaaaaab
+
+But will not match:
+
+   b
+
+The `?` operator will match the preceding atom zero or one times, for 
+example the expression ca?b will match any of the following:
+
+   cb
+   cab
+
+But will not match:
+
+   caab
+
+An atom can also be repeated with a bounded repeat:
+
+`a{n}`  Matches 'a' repeated exactly n times.
+
+`a{n,}`  Matches 'a' repeated n or more times.
+
+`a{n, m}`  Matches 'a' repeated between n and m times inclusive.
+
+For example:
+
+[pre ^a{2,3}$]
+
+Will match either of:
+
+   aa
+   aaa
+
+But neither of:
+
+   a
+   aaaa
+
+It is an error to use a repeat operator, if the preceding construct can not 
+be repeated, for example:
+
+   a(*)
+
+Will raise an error, as there is nothing for the `*` operator to be applied to.
+
+[h4 Non greedy repeats]
+
+The normal repeat operators are "greedy", that is to say they will consume as 
+much input as possible.  There are non-greedy versions available that will 
+consume as little input as possible while still producing a match.
+
+`*?` Matches the previous atom zero or more times, while consuming as little 
+   input as possible.
+
+`+?` Matches the previous atom one or more times, while consuming as 
+   little input as possible.
+
+`??` Matches the previous atom zero or one times, while consuming 
+   as little input as possible.
+
+`{n,}?` Matches the previous atom n or more times, while consuming as 
+   little input as possible.
+
+`{n,m}?` Matches the previous atom between n and m times, while 
+   consuming as little input as possible.
+   
+[h4 Back references]
+
+An escape character followed by a digit /n/, where /n/ is in the range 1-9, 
+matches the same string that was matched by sub-expression /n/.  For example 
+the expression:
+
+[pre ^(a\*).\*\\1$]
+
+Will match the string:
+
+   aaabbaaa
+
+But not the string:
+
+   aaabba
+
+[h4 Alternation]
+
+The `|` operator will match either of its arguments, so for example: 
+`abc|def` will match either "abc" or "def". 
+
+Parenthesis can be used to group alternations, for example: `ab(d|ef)` 
+will match either of "abd" or "abef".
+
+Empty alternatives are not allowed (these are almost always a mistake), but 
+if you really want an empty alternative use `(?:)` as a placeholder, for example:
+
+`|abc` is not a valid expression, but
+
+`(?:)|abc` is and is equivalent, also the expression:
+
+`(?:abc)??` has exactly the same effect.
+
+[h4 Character sets]
+
+A character set is a bracket-expression starting with `[` and ending with `]`, 
+it defines a set of characters, and matches any single character that is a 
+member of that set.
+
+A bracket expression may contain any combination of the following:
+
+[h5 Single characters]
+
+For example `[abc]`, will match any of the characters 'a', 'b', or 'c'.
+
+[h5 Character ranges]
+
+For example `[a-c]` will match any single character in the range 'a' to 'c'.  
+By default, for Perl regular expressions, a character x is within the 
+range y to z, if the code point of the character lies within the codepoints of
+the endpoints of the range.  Alternatively, if you set the 
+[link boost_regex.ref.syntax_option_type.syntax_option_type_perl `collate` flag] 
+when constructing the regular expression, then ranges are locale sensitive.
+
+[h5 Negation]
+
+If the bracket-expression begins with the ^ character, then it matches the 
+complement of the characters it contains, for example `[^a-c]` matches 
+any character that is not in the range `a-c`.
+
+[h5 Character classes]
+
+An expression of the form `[[:name:]]` matches the named character class 
+"name", for example `[[:lower:]]` matches any lower case character.  
+See [link boost_regex.syntax.character_classes character class names].
+
+[h5 Collating Elements]
+
+An expression of the form `[[.col.]` matches the collating element /col/.  
+A collating element is any single character, or any sequence of characters 
+that collates as a single unit.  Collating elements may also be used 
+as the end point of a range, for example: `[[.ae.]-c]` matches the 
+character sequence "ae", plus any single character in the range "ae"-c, 
+assuming that "ae" is treated as a single collating element in the current locale.
+
+As an extension, a collating element may also be specified via it's 
+[link boost_regex.syntax.collating_names symbolic name], for example:
+
+   [[.NUL.]]
+
+matches a `\0` character.
+
+[h5 Equivalence classes]
+
+An expression of the form `[[=col=]]`, matches any character or collating element 
+whose primary sort key is the same as that for collating element /col/, as with 
+collating elements the name /col/ may be a 
+[link boost_regex.syntax.collating_names symbolic name].  A primary sort key is 
+one that ignores case, accentation, or locale-specific tailorings; so for 
+example `[[=a=]]` matches any of the characters: 
+a, '''&#xC0;''', '''&#xC1;''', '''&#xC2;''', 
+'''&#xC3;''', '''&#xC4;''', '''&#xC5;''', A, '''&#xE0;''', '''&#xE1;''', 
+'''&#xE2;''', '''&#xE3;''', '''&#xE4;''' and '''&#xE5;'''.  
+Unfortunately implementation of this is reliant on the platform's collation 
+and localisation support; this feature can not be relied upon to work portably 
+across all platforms, or even all locales on one platform.
+
+[h5 Escaped Characters]
+
+All the escape sequences that match a single character, or a single character 
+class are permitted within a character class definition.  For example
+`[\[\]]` would match either of `[` or `]` while `[\W\d]` would match any character
+that is either a "digit", /or/ is /not/ a "word" character.
+
+[h5 Combinations]
+
+All of the above can be combined in one character set declaration, for example: 
+`[[:digit:]a-c[.NUL.]]`.
+
+[h4 Escapes]
+
+Any special character preceded by an escape shall match itself.
+
+The following escape sequences are all synonyms for single characters:
+
+[table
+[[Escape][Character]]
+[[`\a`][`\a`]]
+[[`\e`][`0x1B`]]
+[[`\f`][`\f`]]
+[[`\n`][`\n`]]
+[[`\r`][`\r`]]
+[[`\t`][`\t`]]
+[[`\v `][`\v`]]
+[[`\b`][`\b` (but only inside a character class declaration).]]
+[[`\cX`][An ASCII escape sequence - the character whose code point is X % 32]]
+[[`\xdd`][A hexadecimal escape sequence - matches the single character whose 
+      code point is 0xdd.]]
+[[`\x{dddd}`][A hexadecimal escape sequence - matches the single character whose 
+      code point is 0xdddd.]]
+[[`\0ddd`][An octal escape sequence - matches the single character whose 
+   code point is 0ddd.]]
+[[`\N{name}`][Matches the single character which has the 
+      [link boost_regex.syntax.collating_names symbolic name] /name/.  
+      For example `\N{newline}` matches the single character \\n.]]
+]      
+ 
+[h5 "Single character" character classes:]
+
+Any escaped character /x/, if /x/ is the name of a character class shall 
+match any character that is a member of that class, and any 
+escaped character /X/, if /x/ is the name of a character class, shall 
+match any character not in that class.
+
+The following are supported by default:
+
+[table
+[[Escape sequence][Equivalent to]]
+[[`\d`][`[[:digit:]]`]]
+[[`\l`][`[[:lower:]]`]]
+[[`\s`][`[[:space:]]`]]
+[[`\u`][`[[:upper:]]`]]
+[[`\w`][`[[:word:]]`]]
+[[`\D`][`[^[:digit:]]`]]
+[[`\L`][`[^[:lower:]]`]]
+[[`\S`][`[^[:space:]]`]]
+[[`\U`][`[^[:upper:]]`]]
+[[`\W`][`[^[:word:]]`]]
+]
+
+[h5 Character Properties]
+
+The character property names in the following table are all equivalent 
+to the [link boost_regex.syntax.character_classes names used in character classes].
+
+[table
+[[Form][Description][Equivalent character set form]]
+[[`\pX`][Matches any character that has the property X.][`[[:X:]]`]]
+[[`\p{Name}`][Matches any character that has the property Name.][`[[:Name:]]`]]
+[[`\PX`][Matches any character that does not have the property X.][`[^[:X:]]`]]
+[[`\P{Name}`][Matches any character that does not have the property Name.][`[^[:Name:]]`]]
+]
+
+For example `\pd` matches any "digit" character, as does `\p{digit}`.
+
+[h5 Word Boundaries]
+
+The following escape sequences match the boundaries of words:
+
+`\<` 	Matches the start of a word.
+
+`\>` 	Matches the end of a word.
+
+`\b` 	Matches a word boundary (the start or end of a word).
+
+`\B` 	Matches only when not at a word boundary.
+
+[h5 Buffer boundaries]
+
+The following match only at buffer boundaries: a "buffer" in this 
+context is the whole of the input text that is being matched against 
+(note that ^ and $ may match embedded newlines within the text).
+
+\\\` 	Matches at the start of a buffer only.
+
+\\' 	Matches at the end of a buffer only.
+
+\\A 	Matches at the start of a buffer only (the same as \\\`).
+
+\\z 	Matches at the end of a buffer only (the same as \\').
+
+\\Z 	Matches an optional sequence of newlines at the end of a buffer: 
+equivalent to the regular expression `\n*\z`
+
+[h5 Continuation Escape]
+
+The sequence `\G` matches only at the end of the last match found, or at 
+the start of the text being matched if no previous match was found.  
+This escape useful if you're iterating over the matches contained within a 
+text, and you want each subsequence match to start where the last one ended.
+
+[h5 Quoting escape]
+
+The escape sequence `\Q` begins a "quoted sequence": all the subsequent characters 
+are treated as literals, until either the end of the regular expression or \\E 
+is found.  For example the expression: `\Q\*+\Ea+` would match either of:
+
+    \*+a
+    \*+aaa
+
+[h5 Unicode escapes]
+
+`\C` 	Matches a single code point: in Boost regex this has exactly the 
+   same effect as a "." operator.
+`\X` 	Matches a combining character sequence: that is any non-combining 
+      character followed by a sequence of zero or more combining characters.
+    
+[h5 Any other escape]
+
+Any other escape sequence matches the character that is escaped, for example 
+\\@ matches a literal '@'.
+
+[h4 Perl Extended Patterns]
+
+Perl-specific extensions to the regular expression syntax all start with `(?`.
+
+[h5 Comments]
+
+`(?# ... )` is treated as a comment, it's contents are ignored.
+
+[h5 Modifiers]
+
+`(?imsx-imsx ... )` alters which of the perl modifiers are in effect within 
+the pattern, changes take effect from the point that the block is first seen 
+and extend to any enclosing `)`.  Letters before a '-' turn that perl 
+modifier on, letters afterward, turn it off.
+
+`(?imsx-imsx:pattern)` applies the specified modifiers to pattern only.
+
+[h5 Non-marking groups]
+
+`(?:pattern)` lexically groups pattern, without generating an additional 
+sub-expression.
+
+[h5 Lookahead]
+
+`(?=pattern)` consumes zero characters, only if pattern matches.
+
+`(?!pattern)` consumes zero characters, only if pattern does not match.
+
+Lookahead is typically used to create the logical AND of two regular 
+expressions, for example if a password must contain a lower case letter, 
+an upper case letter, a punctuation symbol, and be at least 6 characters long, 
+then the expression:
+
+    (?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}
+
+could be used to validate the password.
+
+[h5 Lookbehind]
+
+`(?<=pattern)` consumes zero characters, only if pattern could be matched 
+against the characters preceding the current position (pattern must be 
+of fixed length).
+
+`(?<!pattern)` consumes zero characters, only if pattern could not be 
+matched against the characters preceding the current position (pattern must 
+be of fixed length).
+
+[h5 Independent sub-expressions]
+
+`(?>pattern)` /pattern/ is matched independently of the surrounding patterns, 
+the expression will never backtrack into /pattern/.  Independent sub-expressions 
+are typically used to improve performance; only the best possible match 
+for pattern will be considered, if this doesn't allow the expression as a 
+whole to match then no match is found at all.
+
+[h5 Conditional Expressions]
+
+`(?(condition)yes-pattern|no-pattern)` attempts to match /yes-pattern/ if 
+the /condition/ is true, otherwise attempts to match /no-pattern/.
+
+`(?(condition)yes-pattern)` attempts to match /yes-pattern/ if the /condition/ 
+is true, otherwise fails.
+
+/condition/ may be either a forward lookahead assert, or the index of 
+a marked sub-expression (the condition becomes true if the sub-expression 
+has been matched).
+
+[h4 Operator precedence]
+
+The order of precedence for of operators is as follows:
+
+# Collation-related bracket symbols 	`[==] [::] [..]`
+# Escaped characters 	`\`
+# Character set (bracket expression) 	`[]`
+# Grouping 	`()`
+# Single-character-ERE duplication 	`* + ? {m,n}`
+# Concatenation 	
+# Anchoring 	^$
+# Alternation 	|
+
+[h3 What gets matched]
+
+If you view the regular expression as a directed (possibly cyclic) 
+graph, then the best match found is the first match found by a 
+depth-first-search performed on that graph, while matching the input text.
+
+Alternatively:
+
+The best match found is the 
+[link boost_regex.syntax.leftmost_longest_rule leftmost match], 
+with individual elements matched as follows;
+
+[table
+[[Construct][What gets matched]]
+[[`AtomA AtomB`][Locates the best match for /AtomA/ that has a following match for /AtomB/.]]
+[[`Expression1 | Expression2`][If /Expresion1/ can be matched then returns that match, 
+   otherwise attempts to match /Expression2/.]]
+[[`S{N}`][Matches /S/ repeated exactly N times.]]
+[[`S{N,M}`][Matches S repeated between N and M times, and as many times as possible.]]
+[[`S{N,M}?`][Matches S repeated between N and M times, and as few times as possible.]]
+[[`S?, S*, S+`][The same as `S{0,1}`, `S{0,UINT_MAX}`, `S{1,UINT_MAX}` respectively.]]
+[[`S??, S*?, S+?`][The same as `S{0,1}?`, `S{0,UINT_MAX}?`, `S{1,UINT_MAX}?` respectively.]]
+[[`(?>S)`][Matches the best match for /S/, and only that.]]
+[[`(?=S), (?<=S)`][Matches only the best match for /S/ (this is only 
+      visible if there are capturing parenthesis within /S/).]]
+[[`(?!S), (?<!S)`][Considers only whether a match for S exists or not.]]
+[[`(?(condition)yes-pattern | no-pattern)`][If condition is true, then 
+   only yes-pattern is considered, otherwise only no-pattern is considered.]]
+]
+
+[h3 Variations]
+
+The [link boost_regex.ref.syntax_option_type.syntax_option_type_perl options `normal`, 
+`ECMAScript`, `JavaScript` and `JScript`] are all synonyms for 
+`perl`.
+
+[h3 Options]
+
+There are a [link boost_regex.ref.syntax_option_type.syntax_option_type_perl 
+variety of flags] that may be combined with the `perl` option when 
+constructing the regular expression, in particular note that the 
+`newline_alt` option alters the syntax, while the `collate`, `nosubs` and 
+`icase` options modify how the case and locale sensitivity are to be applied.
+
+[h3 Pattern Modifiers]
+
+The perl `smix` modifiers can either be applied using a `(?smix-smix)` 
+prefix to the regular expression, or with one of the 
+[link boost_regex.ref.syntax_option_type.syntax_option_type_perl regex-compile time 
+flags `no_mod_m`, `mod_x`, `mod_s`, and `no_mod_s`].
+
+[h3 References]
+
+[@http://perldoc.perl.org/perlre.html Perl 5.8].
+
+
+[endsect]
+
+
diff --git a/doc/thread_safety.html b/doc/thread_safety.html
deleted file mode 100644
index 894a7688..00000000
--- a/doc/thread_safety.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Thread Safety</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Thread Safety</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <P>The regex library is thread safe when Boost is: you can verify that Boost is in 
-         thread safe mode by checking to see if BOOST_HAS_THREADS is defined: this macro 
-         is set automatically by the config system when threading support is turned on 
-         in your compiler.
-      </P>
-      <P>Class <A href="basic_regex.html">basic_regex</A>&lt;&gt; and its typedefs regex 
-         and wregex are thread safe, in that compiled regular expressions can safely be 
-         shared between threads. The matching algorithms <A href="regex_match.html">regex_match</A>,
-         <A href="regex_search.html">regex_search</A>, <A href="regex_grep.html">regex_grep</A>,
-         <A href="regex_format.html">regex_format</A> and <A href="regex_merge.html">regex_merge</A>
-         are all re-entrant and thread safe. Class <A href="match_results.html">match_results</A>
-         is now thread safe, in that the results of a match can be safely copied from 
-         one thread to another (for example one thread may find matches and push 
-         match_results instances onto a queue, while another thread pops them off the 
-         other end), otherwise use a separate instance of <A href="match_results.html">match_results</A>
-         per thread.
-      </P>
-      <P>The <A href="posix_api.html">POSIX API functions</A> are all re-entrant and 
-         thread safe, regular expressions compiled with <I>regcomp</I> can also be 
-         shared between threads.
-      </P>
-      <P>The class<A href="regex.html"> RegEx</A> is only thread safe if each thread 
-         gets its own RegEx instance (apartment threading) - this is a consequence of 
-         RegEx handling both compiling and matching regular expressions.
-      </P>
-      <P>Finally note that changing the global locale invalidates all compiled regular 
-         expressions, therefore calling <I>set_locale</I> from one thread while another 
-         uses regular expressions <I>will</I> produce unpredictable results.
-      </P>
-      <P>
-         There is also a requirement that there is only one thread executing prior to 
-         the start of main().</P>
-      <HR>
-      <p>Revised 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
diff --git a/doc/thread_safety.qbk b/doc/thread_safety.qbk
new file mode 100644
index 00000000..a95a7ac7
--- /dev/null
+++ b/doc/thread_safety.qbk
@@ -0,0 +1,41 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:thread_safety Thread Safety]
+
+The Boost.Regex library is thread safe when Boost is: you can verify that 
+Boost is in thread safe mode by checking to see if `BOOST_HAS_THREADS` is 
+defined: this macro is set automatically by the config system when 
+threading support is turned on in your compiler.
+
+Class [basic_regex] and its typedefs regex and wregex are thread safe, 
+in that compiled regular expressions can safely be shared between threads. 
+The matching algorithms [regex_match], [regex_search], and [regex_replace]
+are all re-entrant and thread safe. Class [match_results] is now thread safe, 
+in that the results of a match can be safely copied from one thread to 
+another (for example one thread may find matches and push [match_results] 
+instances onto a queue, while another thread pops them off the other end), 
+otherwise use a separate instance of [match_results] per thread.
+
+The [link boost_regex.ref.posix POSIX API functions] are all re-entrant and thread safe, regular 
+expressions compiled with regcomp can also be shared between threads.
+
+The [link boost_regex.ref.deprecated_interfaces.old_regex class RegEx] is 
+only thread safe if each thread gets its own 
+RegEx instance (apartment threading) - this is a consequence of 
+RegEx handling both compiling and matching regular expressions.
+
+Finally note that changing the global locale invalidates all compiled 
+regular expressions, therefore calling `set_locale` from one thread 
+while another uses regular expressions will produce unpredictable results.
+
+There is also a requirement that there is only one thread executing prior 
+to the start of main().
+     
+[endsect]
+
diff --git a/doc/uarrow.gif b/doc/uarrow.gif
deleted file mode 100644
index 6afd20c3..00000000
Binary files a/doc/uarrow.gif and /dev/null differ
diff --git a/doc/unicode.html b/doc/unicode.html
deleted file mode 100644
index 9e22faf3..00000000
--- a/doc/unicode.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-   <head>
-      <title>Boost.Regex: Index</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
-   <body>
-      <P>
-         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
-            <TR>
-               <td valign="top" width="300">
-                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-               </td>
-               <TD width="353">
-                  <H1 align="center">Boost.Regex</H1>
-                  <H2 align="center">Unicode Regular Expressions.</H2>
-               </TD>
-               <td width="50">
-                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-               </td>
-            </TR>
-         </TABLE>
-      </P>
-      <HR>
-      <p></p>
-      <P>There are two ways to use Boost.Regex with Unicode strings:</P>
-      <H3>Rely on wchar_t</H3>
-      <P>If your platform's wchar_t type can hold Unicode strings, <EM>and</EM> your 
-         platform's C/C++ runtime correctly handles wide character constants (when 
-         passed to std::iswspace std::iswlower etc), then you can use boost::wregex to 
-         process Unicode.&nbsp; However, there are several disadvantages to this 
-         approach:</P>
-      <UL>
-         <LI>
-            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.</LI>
-         <LI>
-            There's no support for Unicode-specific character classes: [[:Nd:]], [[:Po:]] 
-            etc.</LI>
-         <LI>
-            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.</LI></UL>
-      <H3>Use a Unicode Aware Regular Expression Type.</H3>
-      <P>If you have the <A href="http://www.ibm.com/software/globalization/icu/">ICU 
-            library</A>, then Boost.Regex can be <A href="install.html#unicode">configured 
-            to make use of it</A>, and provide a distinct regular expression type 
-         (boost::u32regex), that supports both Unicode specific character properties, 
-         and the searching of text that is encoded in either UTF-8, UTF-16, or 
-         UTF-32.&nbsp; See: <A href="icu_strings.html">ICU string class support</A>.</P>
-      <P>
-         <HR>
-      </P>
-      <P></P>
-      <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Jan 2005&nbsp; 
-         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
-      <p><i>© Copyright John Maddock&nbsp;2005</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/doc/unicode.qbk b/doc/unicode.qbk
new file mode 100644
index 00000000..5028921f
--- /dev/null
+++ b/doc/unicode.qbk
@@ -0,0 +1,42 @@
+[/ 
+  Copyright 2006-2007 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).
+]
+
+
+[section:unicode Unicode and Boost.Regex]
+
+There are two ways to use Boost.Regex with Unicode strings:
+
+[h4 Rely on wchar_t]
+
+If your platform's `wchar_t` type can hold Unicode strings, and your 
+platform's C/C++ runtime correctly handles wide character constants 
+(when passed to `std::iswspace` `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.
+
+[h4 Use a Unicode Aware Regular Expression Type.]
+
+If you have the 
+[@http://www.ibm.com/software/globalization/icu/ ICU library], then 
+Boost.Regex can be 
+[link boost_regex.install.building_with_unicode_and_icu_support 
+configured to make use 
+of it], and provide a distinct regular expression type (boost::u32regex), 
+that supports both Unicode specific character properties, and the searching 
+of text that is encoded in either UTF-8, UTF-16, or UTF-32.  See: 
+[link boost_regex.ref.non_std_strings.icu 
+ICU string class support].
+
+[endsect]
+
diff --git a/doc/vc71-performance.html b/doc/vc71-performance.html
deleted file mode 100644
index c847845a..00000000
--- a/doc/vc71-performance.html
+++ /dev/null
@@ -1,703 +0,0 @@
-<html>
-   <head>
-      <title>Regular Expression Performance Comparison</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-      <meta name="Template" content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
-      <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
-   </head>
-   <body bgcolor="#ffffff" link="#0000ff" vlink="#800080">
-      <h2>Regular Expression Performance Comparison</h2>
-      <p>
-         The following tables provide comparisons between the following regular 
-         expression libraries:</p>
-      <p><a href="http://research.microsoft.com/projects/greta">GRETA</a>.</p>
-      <p><a href="http://www.boost.org/">The Boost regex library</a>.</p>
-      <p><a href="http://arglist.com/regex/">Henry Spencer's regular expression library</a>
-         - this is provided for comparison as a typical non-backtracking implementation.</p>
-      <P>Philip Hazel's <A href="http://www.pcre.org">PCRE</A> library.</P>
-      <H3>Details</H3>
-      <P>Machine: Intel Pentium 4 2.8GHz PC.</P>
-      <P>Compiler: Microsoft Visual C++ version 7.1.</P>
-      <P>C++ Standard Library: Dinkumware standard library version 313.</P>
-      <P>OS: Win32.</P>
-      <P>Boost version: 1.31.0.</P>
-      <P>PCRE version: 3.9.</P>
-      <P>
-         As ever care should be taken in interpreting the results, only sensible regular 
-         expressions (rather than pathological cases) are given, most are taken from the 
-         Boost regex examples, or from the <a href="http://www.regxlib.com/">Library of 
-            Regular Expressions</a>. In addition, some variation in the relative 
-         performance of these libraries can be expected on other machines - as memory 
-         access and processor caching effects can be quite large for most finite state 
-         machine algorithms.</P>
-      <H3>Averages</H3>
-      <P>The following are the average relative scores for all the tests: the perfect 
-         regular expression library&nbsp;would score 1, in practice any small number 
-         (say less that 4 or 5) is pretty good.</P>
-      <P><table border="1" cellspacing="1">
-            <tr>
-               <td><strong>GRETA</strong></td>
-               <td><strong>GRETA<BR>
-                     (non-recursive mode)</strong></td>
-               <td><strong>Boost</strong></td>
-               <td><strong>Boost + C++ locale</strong></td>
-               <td><strong>POSIX</strong></td>
-               <td><strong>PCRE</strong></td>
-            </tr>
-            <tr>
-               <td>2.31619</td>
-               <td>6.14203</td>
-               <td>2.30668</td>
-               <td>1.94363</td>
-               <td>124.752</td>
-               <td>2.09365</td>
-            </tr>
-         </table>
-      </P>
-      <h3>Comparison 1: Long Search</h3>
-      <p>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within a long English language text was measured 
-         (<a href="http://www.gutenberg.org/files/3200/old/mtent12.zip">mtent12.txt</a>
-         from <a href="http://promo.net/pg/">Project Gutenberg</a>, 19Mb).&nbsp;</p>
-      <P><table border="1" cellspacing="1">
-            <tr>
-               <td><strong>Expression</strong></td>
-               <td><strong>GRETA</strong></td>
-               <td><strong>GRETA<BR>
-                     (non-recursive mode)</strong></td>
-               <td><strong>Boost</strong></td>
-               <td><strong>Boost + C++ locale</strong></td>
-               <td><strong>POSIX</strong></td>
-               <td><strong>PCRE</strong></td>
-            </tr>
-            <tr>
-               <td><code>Twain</code></td>
-               <td><font color="#008000">1<BR>
-                     (0.0407s)</font></td>
-               <td><font color="#008000">1<BR>
-                     (0.0407s)</font></td>
-               <td>4.18<BR>
-                  (0.17s)</td>
-               <td>4.18<BR>
-                  (0.17s)</td>
-               <td>135<BR>
-                  (5.48s)</td>
-               <td>1.37<BR>
-                  (0.0557s)</td>
-            </tr>
-            <tr>
-               <td><code>Huck[[:alpha:]]+</code></td>
-               <td><font color="#008000">1.02<BR>
-                     (0.0381s)</font></td>
-               <td><font color="#008000">1<BR>
-                     (0.0375s)</font></td>
-               <td>4.53<BR>
-                  (0.17s)</td>
-               <td>4.54<BR>
-                  (0.17s)</td>
-               <td>166<BR>
-                  (6.23s)</td>
-               <td>1.34<BR>
-                  (0.0501s)</td>
-            </tr>
-            <tr>
-               <td><code>[[:alpha:]]+ing</code></td>
-               <td>4.3<BR>
-                  (4.18s)</td>
-               <td>9.93<BR>
-                  (9.65s)</td>
-               <td>1.15<BR>
-                  (1.12s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.972s)</font></td>
-               <td>8.15<BR>
-                  (7.92s)</td>
-               <td>5.85<BR>
-                  (5.69s)</td>
-            </tr>
-            <tr>
-               <td><code>^[^ ]*?Twain</code></td>
-               <td>6.25<BR>
-                  (1.84s)</td>
-               <td>20.9<BR>
-                  (6.16s)</td>
-               <td>1.56<BR>
-                  (0.461s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.295s)</font></td>
-               <td>NA</td>
-               <td>2.58<BR>
-                  (0.761s)</td>
-            </tr>
-            <tr>
-               <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
-               <td>6.53<BR>
-                  (0.711s)</td>
-               <td>11.5<BR>
-                  (1.25s)</td>
-               <td>2.3<BR>
-                  (0.251s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.109s)</font></td>
-               <td>196<BR>
-                  (21.4s)</td>
-               <td>1.77<BR>
-                  (0.193s)</td>
-            </tr>
-            <tr>
-               <td><code>(Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
-               <td>3.88<BR>
-                  (0.972s)</td>
-               <td>6.48<BR>
-                  (1.62s)</td>
-               <td>1.66<BR>
-                  (0.416s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.251s)</font></td>
-               <td>NA</td>
-               <td>2.48<BR>
-                  (0.62s)</td>
-            </tr>
-         </table>
-      </P>
-      <h3>Comparison 2: Medium Sized Search</h3>
-      <p>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within a medium sized English language text was 
-         measured (the first 50K from mtent12.txt).&nbsp;</p>
-      <P><table border="1" cellspacing="1">
-            <tr>
-               <td><strong>Expression</strong></td>
-               <td><strong>GRETA</strong></td>
-               <td><strong>GRETA<BR>
-                     (non-recursive mode)</strong></td>
-               <td><strong>Boost</strong></td>
-               <td><strong>Boost + C++ locale</strong></td>
-               <td><strong>POSIX</strong></td>
-               <td><strong>PCRE</strong></td>
-            </tr>
-            <tr>
-               <td><code>Twain</code></td>
-               <td><font color="#008000">1<BR>
-                     (9.05e-005s)</font></td>
-               <td><font color="#008000">1.03<BR>
-                     (9.29e-005s)</font></td>
-               <td>4.92<BR>
-                  (0.000445s)</td>
-               <td>4.92<BR>
-                  (0.000445s)</td>
-               <td>43.2<BR>
-                  (0.00391s)</td>
-               <td>3.18<BR>
-                  (0.000288s)</td>
-            </tr>
-            <tr>
-               <td><code>Huck[[:alpha:]]+</code></td>
-               <td><font color="#008000">1<BR>
-                     (8.56e-005s)</font></td>
-               <td><font color="#008000">1<BR>
-                     (8.56e-005s)</font></td>
-               <td>4.97<BR>
-                  (0.000425s)</td>
-               <td>4.98<BR>
-                  (0.000426s)</td>
-               <td>2.8<BR>
-                  (0.000239s)</td>
-               <td>2.2<BR>
-                  (0.000188s)</td>
-            </tr>
-            <tr>
-               <td><code>[[:alpha:]]+ing</code></td>
-               <td>5.29<BR>
-                  (0.011s)</td>
-               <td>11.8<BR>
-                  (0.0244s)</td>
-               <td>1.19<BR>
-                  (0.00246s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.00207s)</font></td>
-               <td>8.77<BR>
-                  (0.0182s)</td>
-               <td>6.88<BR>
-                  (0.0142s)</td>
-            </tr>
-            <tr>
-               <td><code>^[^ ]*?Twain</code></td>
-               <td>5.98<BR>
-                  (0.00462s)</td>
-               <td>20.2<BR>
-                  (0.0156s)</td>
-               <td>1.54<BR>
-                  (0.00119s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.000772s)</font></td>
-               <td>NA</td>
-               <td>2.53<BR>
-                  (0.00195s)</td>
-            </tr>
-            <tr>
-               <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
-               <td>3.42<BR>
-                  (0.00207s)</td>
-               <td>6.31<BR>
-                  (0.00383s)</td>
-               <td>1.71<BR>
-                  (0.00104s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.000606s)</font></td>
-               <td>81.5<BR>
-                  (0.0494s)</td>
-               <td>1.96<BR>
-                  (0.00119s)</td>
-            </tr>
-            <tr>
-               <td><code>(Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
-               <td>1.97<BR>
-                  (0.00266s)</td>
-               <td>3.77<BR>
-                  (0.00509s)</td>
-               <td>1.38<BR>
-                  (0.00186s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.00135s)</font></td>
-               <td>297<BR>
-                  (0.401s)</td>
-               <td>1.77<BR>
-                  (0.00238s)</td>
-            </tr>
-         </table>
-      </P>
-      <H3>Comparison 3:&nbsp;C++ Code&nbsp;Search</H3>
-      <P>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within the C++ source file <A href="../../../boost/crc.hpp">
-            boost/crc.hpp</A>&nbsp;was measured.&nbsp;</P>
-      <P><table border="1" cellspacing="1">
-            <tr>
-               <td><strong>Expression</strong></td>
-               <td><strong>GRETA</strong></td>
-               <td><strong>GRETA<BR>
-                     (non-recursive mode)</strong></td>
-               <td><strong>Boost</strong></td>
-               <td><strong>Boost + C++ locale</strong></td>
-               <td><strong>POSIX</strong></td>
-               <td><strong>PCRE</strong></td>
-            </tr>
-            <tr>
-               <td><code>^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?(class|struct)[[:space:]]*(\&lt;\w+\&gt;([ 
-                     ]*\([^)]*\))?[[:space:]]*)*(\&lt;\w*\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?(\{|:[^;\{()]*\{)</code></td>
-               <td>6.67<BR>
-                  (0.00147s)</td>
-               <td>36.9<BR>
-                  (0.00813s)</td>
-               <td><font color="#008000">1.03<BR>
-                     (0.000227s)</font></td>
-               <td><font color="#008000">1<BR>
-                     (0.00022s)</font></td>
-               <td>557<BR>
-                  (0.123s)</td>
-               <td>2.57<BR>
-                  (0.000566s)</td>
-            </tr>
-            <tr>
-               <td><code>(^[ 
-                     ]*#(?:[^\\\n]|\\[^\n_[:punct:][:alnum:]]*[\n[:punct:][:word:]])*)|(//[^\n]*|/\*.*?\*/)|\&lt;([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\.)?[[:digit:]]+(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\&gt;|('(?:[^\\']|\\.)*'|"(?:[^\\"]|\\.)*")|\&lt;(__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|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\&gt;</code></td>
-               <td><font color="#008000">1<BR>
-                     (0.00555s)</font></td>
-               <td>3.32<BR>
-                  (0.0185s)</td>
-               <td>2.53<BR>
-                  (0.0141s)</td>
-               <td>1.94<BR>
-                  (0.0108s)</td>
-               <td>NA</td>
-               <td>3.38<BR>
-                  (0.0188s)</td>
-            </tr>
-            <tr>
-               <td><code>^[ ]*#[ ]*include[ ]+("[^"]+"|&lt;[^&gt;]+&gt;)</code></td>
-               <td>4.77<BR>
-                  (0.00156s)</td>
-               <td>24.8<BR>
-                  (0.00814s)</td>
-               <td>1.13<BR>
-                  (0.000372s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.000328s)</font></td>
-               <td>120<BR>
-                  (0.0394s)</td>
-               <td>1.58<BR>
-                  (0.000518s)</td>
-            </tr>
-            <tr>
-               <td><code>^[ ]*#[ ]*include[ ]+("boost/[^"]+"|&lt;boost/[^&gt;]+&gt;)</code></td>
-               <td>4.72<BR>
-                  (0.00154s)</td>
-               <td>24.8<BR>
-                  (0.00813s)</td>
-               <td>1.12<BR>
-                  (0.000367s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.000328s)</font></td>
-               <td>143<BR>
-                  (0.0469s)</td>
-               <td>1.58<BR>
-                  (0.000518s)</td>
-            </tr>
-         </table>
-      </P>
-      <H3>
-         <H3>Comparison 4: HTML Document Search</H3>
-      </H3>
-      <P>For each of the following regular expressions the time taken to find all 
-         occurrences of the expression within the html file <A href="../../libraries.htm">libs/libraries.htm</A>
-         was measured.&nbsp;</P>
-      <P><table border="1" cellspacing="1">
-            <tr>
-               <td><strong>Expression</strong></td>
-               <td><strong>GRETA</strong></td>
-               <td><strong>GRETA<BR>
-                     (non-recursive mode)</strong></td>
-               <td><strong>Boost</strong></td>
-               <td><strong>Boost + C++ locale</strong></td>
-               <td><strong>POSIX</strong></td>
-               <td><strong>PCRE</strong></td>
-            </tr>
-            <tr>
-               <td><code>beman|john|dave</code></td>
-               <td>4.07<BR>
-                  (0.00111s)</td>
-               <td>7.14<BR>
-                  (0.00195s)</td>
-               <td>1.75<BR>
-                  (0.000479s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.000273s)</font></td>
-               <td>54.3<BR>
-                  (0.0149s)</td>
-               <td>1.83<BR>
-                  (0.000499s)</td>
-            </tr>
-            <tr>
-               <td><code>&lt;p&gt;.*?&lt;/p&gt;</code></td>
-               <td><font color="#008000">1<BR>
-                     (6.59e-005s)</font></td>
-               <td><font color="#008000">1.04<BR>
-                     (6.84e-005s)</font></td>
-               <td>4.15<BR>
-                  (0.000273s)</td>
-               <td>4.23<BR>
-                  (0.000279s)</td>
-               <td>NA</td>
-               <td>4.23<BR>
-                  (0.000279s)</td>
-            </tr>
-            <tr>
-               <td><code>&lt;a[^&gt;]+href=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
-               <td>1.39<BR>
-                  (0.000626s)</td>
-               <td>1.83<BR>
-                  (0.000821s)</td>
-               <td>1.41<BR>
-                  (0.000636s)</td>
-               <td><font color="#008000">1<BR>
-                     (0.00045s)</font></td>
-               <td>351<BR>
-                  (0.158s)</td>
-               <td>1.13<BR>
-                  (0.000509s)</td>
-            </tr>
-            <tr>
-               <td><code>&lt;h[12345678][^&gt;]*&gt;.*?&lt;/h[12345678]&gt;</code></td>
-               <td><font color="#008000">1<BR>
-                     (0.000142s)</font></td>
-               <td>1.21<BR>
-                  (0.000171s)</td>
-               <td>2.62<BR>
-                  (0.000372s)</td>
-               <td>1.48<BR>
-                  (0.00021s)</td>
-               <td>NA</td>
-               <td>1.73<BR>
-                  (0.000245s)</td>
-            </tr>
-            <tr>
-               <td><code>&lt;img[^&gt;]+src=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
-               <td><font color="#008000">1<BR>
-                     (5.38e-005s)</font></td>
-               <td><font color="#008000">1.05<BR>
-                     (5.63e-005s)</font></td>
-               <td>5<BR>
-                  (0.000269s)</td>
-               <td>5.18<BR>
-                  (0.000278s)</td>
-               <td>604<BR>
-                  (0.0325s)</td>
-               <td>4.05<BR>
-                  (0.000218s)</td>
-            </tr>
-            <tr>
-               <td><code>&lt;font[^&gt;]+face=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;.*?&lt;/font&gt;</code></td>
-               <td><font color="#008000">1<BR>
-                     (6.05e-005s)</font></td>
-               <td><font color="#008000">1.09<BR>
-                     (6.59e-005s)</font></td>
-               <td>4.45<BR>
-                  (0.000269s)</td>
-               <td>4.69<BR>
-                  (0.000284s)</td>
-               <td>NA</td>
-               <td>3.64<BR>
-                  (0.00022s)</td>
-            </tr>
-         </table>
-      </P>
-      <H3>Comparison 3: Simple Matches</H3>
-      <p>
-         For each of the following regular expressions the time taken to match against 
-         the text indicated was measured.&nbsp;</p>
-      <P><table border="1" cellspacing="1">
-            <tr>
-               <td><strong>Expression</strong></td>
-               <td><strong>Text</strong></td>
-               <td><strong>GRETA</strong></td>
-               <td><strong>GRETA<BR>
-                     (non-recursive mode)</strong></td>
-               <td><strong>Boost</strong></td>
-               <td><strong>Boost + C++ locale</strong></td>
-               <td><strong>POSIX</strong></td>
-               <td><strong>PCRE</strong></td>
-            </tr>
-            <tr>
-               <td><code>abc</code></td>
-               <td>abc</td>
-               <td>1.32<BR>
-                  (2.24e-007s)</td>
-               <td>1.86<BR>
-                  (3.15e-007s)</td>
-               <td>1.25<BR>
-                  (2.12e-007s)</td>
-               <td>1.24<BR>
-                  (2.1e-007s)</td>
-               <td>2.98<BR>
-                  (5.05e-007s)</td>
-               <td><font color="#008000">1<BR>
-                     (1.7e-007s)</font></td>
-            </tr>
-            <tr>
-               <td><code>^([0-9]+)(\-| |$)(.*)$</code></td>
-               <td>100- this is a line of ftp response which contains a message string</td>
-               <td>1.32<BR>
-                  (5.91e-007s)</td>
-               <td>1.96<BR>
-                  (8.78e-007s)</td>
-               <td>2.68<BR>
-                  (1.2e-006s)</td>
-               <td>1.53<BR>
-                  (6.88e-007s)</td>
-               <td>332<BR>
-                  (0.000149s)</td>
-               <td><font color="#008000">1<BR>
-                     (4.49e-007s)</font></td>
-            </tr>
-            <tr>
-               <td><code>([[:digit:]]{4}[- ]){3}[[:digit:]]{3,4}</code></td>
-               <td>1234-5678-1234-456</td>
-               <td>1.44<BR>
-                  (7.16e-007s)</td>
-               <td>2.04<BR>
-                  (1.01e-006s)</td>
-               <td>3.35<BR>
-                  (1.66e-006s)</td>
-               <td>2.15<BR>
-                  (1.07e-006s)</td>
-               <td>31.4<BR>
-                  (1.56e-005s)</td>
-               <td><font color="#008000">1<BR>
-                     (4.96e-007s)</font></td>
-            </tr>
-            <tr>
-               <td><code>^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
-               <td>john@johnmaddock.co.uk</td>
-               <td><font color="#008000">1<BR>
-                     (1.18e-006s)</font></td>
-               <td>1.42<BR>
-                  (1.68e-006s)</td>
-               <td>2.06<BR>
-                  (2.44e-006s)</td>
-               <td>1.35<BR>
-                  (1.6e-006s)</td>
-               <td>165<BR>
-                  (0.000196s)</td>
-               <td><font color="#008000">1.06<BR>
-                     (1.26e-006s)</font></td>
-            </tr>
-            <tr>
-               <td><code>^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
-               <td>foo12@foo.edu</td>
-               <td><font color="#008000">1<BR>
-                     (1.09e-006s)</font></td>
-               <td>1.44<BR>
-                  (1.57e-006s)</td>
-               <td>2.21<BR>
-                  (2.4e-006s)</td>
-               <td>1.41<BR>
-                  (1.53e-006s)</td>
-               <td>108<BR>
-                  (0.000117s)</td>
-               <td><font color="#008000">1.04<BR>
-                     (1.13e-006s)</font></td>
-            </tr>
-            <tr>
-               <td><code>^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
-               <td>bob.smith@foo.tv</td>
-               <td><font color="#008000">1<BR>
-                     (1.07e-006s)</font></td>
-               <td>1.43<BR>
-                  (1.53e-006s)</td>
-               <td>2.21<BR>
-                  (2.37e-006s)</td>
-               <td>1.45<BR>
-                  (1.55e-006s)</td>
-               <td>123<BR>
-                  (0.000132s)</td>
-               <td><font color="#008000">1.05<BR>
-                     (1.13e-006s)</font></td>
-            </tr>
-            <tr>
-               <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
-               <td>EH10 2QQ</td>
-               <td><font color="#008000">1<BR>
-                     (3.19e-007s)</font></td>
-               <td>1.67<BR>
-                  (5.34e-007s)</td>
-               <td>1.58<BR>
-                  (5.05e-007s)</td>
-               <td>1.4<BR>
-                  (4.49e-007s)</td>
-               <td>10.4<BR>
-                  (3.32e-006s)</td>
-               <td>1.15<BR>
-                  (3.68e-007s)</td>
-            </tr>
-            <tr>
-               <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
-               <td>G1 1AA</td>
-               <td><font color="#008000">1<BR>
-                     (3.29e-007s)</font></td>
-               <td>1.65<BR>
-                  (5.44e-007s)</td>
-               <td>1.51<BR>
-                  (4.96e-007s)</td>
-               <td>1.36<BR>
-                  (4.49e-007s)</td>
-               <td>8.46<BR>
-                  (2.79e-006s)</td>
-               <td>1.1<BR>
-                  (3.63e-007s)</td>
-            </tr>
-            <tr>
-               <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
-               <td>SW1 1ZZ</td>
-               <td><font color="#008000">1<BR>
-                     (3.25e-007s)</font></td>
-               <td>1.64<BR>
-                  (5.34e-007s)</td>
-               <td>1.56<BR>
-                  (5.05e-007s)</td>
-               <td>1.38<BR>
-                  (4.49e-007s)</td>
-               <td>9.29<BR>
-                  (3.02e-006s)</td>
-               <td>1.13<BR>
-                  (3.68e-007s)</td>
-            </tr>
-            <tr>
-               <td><code>^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
-               <td>4/1/2001</td>
-               <td><font color="#008000">1<BR>
-                     (3.44e-007s)</font></td>
-               <td>1.55<BR>
-                  (5.34e-007s)</td>
-               <td>2.36<BR>
-                  (8.12e-007s)</td>
-               <td>2.2<BR>
-                  (7.55e-007s)</td>
-               <td>19.6<BR>
-                  (6.72e-006s)</td>
-               <td>1.81<BR>
-                  (6.21e-007s)</td>
-            </tr>
-            <tr>
-               <td><code>^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
-               <td>12/12/2001</td>
-               <td><font color="#008000">1.05<BR>
-                     (6.59e-007s)</font></td>
-               <td>1.66<BR>
-                  (1.05e-006s)</td>
-               <td>1.44<BR>
-                  (9.07e-007s)</td>
-               <td>1.23<BR>
-                  (7.73e-007s)</td>
-               <td>11.6<BR>
-                  (7.34e-006s)</td>
-               <td><font color="#008000">1<BR>
-                     (6.3e-007s)</font></td>
-            </tr>
-            <tr>
-               <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
-               <td>123</td>
-               <td><font color="#008000">1<BR>
-                     (5.72e-007s)</font></td>
-               <td>1.59<BR>
-                  (9.07e-007s)</td>
-               <td>1.6<BR>
-                  (9.16e-007s)</td>
-               <td>1.49<BR>
-                  (8.5e-007s)</td>
-               <td>6.14<BR>
-                  (3.51e-006s)</td>
-               <td>1.22<BR>
-                  (6.97e-007s)</td>
-            </tr>
-            <tr>
-               <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
-               <td>+3.14159</td>
-               <td><font color="#008000">1<BR>
-                     (6.78e-007s)</font></td>
-               <td>1.52<BR>
-                  (1.03e-006s)</td>
-               <td>1.47<BR>
-                  (9.94e-007s)</td>
-               <td>1.31<BR>
-                  (8.88e-007s)</td>
-               <td>10.8<BR>
-                  (7.34e-006s)</td>
-               <td><font color="#008000">1.08<BR>
-                     (7.35e-007s)</font></td>
-            </tr>
-            <tr>
-               <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
-               <td>-3.14159</td>
-               <td><font color="#008000">1<BR>
-                     (6.78e-007s)</font></td>
-               <td>1.52<BR>
-                  (1.03e-006s)</td>
-               <td>1.46<BR>
-                  (9.92e-007s)</td>
-               <td>1.32<BR>
-                  (8.98e-007s)</td>
-               <td>10.5<BR>
-                  (7.11e-006s)</td>
-               <td>1.11<BR>
-                  (7.54e-007s)</td>
-            </tr>
-         </table>
-      </P>
-      <hr>
-      <p><i>© Copyright John Maddock&nbsp;2003</i></p>
-      <P><I>Use, modification and distribution are subject to the Boost Software License, 
-            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
-            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-   </body>
-</html>
-
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index c56d1748..295ef904 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -4,7 +4,12 @@
 # http://www.boost.org/LICENSE_1_0.txt.
 
 project
-    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+    : requirements 
+      <threading>multi 
+      <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+      # There are unidentified linker problems on these platforms:
+      <toolset>mipspro-7.4:<link>static
+      <toolset>sun-5.9:<link>static
     ;
 
 
@@ -20,6 +25,7 @@ rule regex-test-run ( sources + : input * : name * )
             $(input)
          :  # test-files
          :  # requirements
+            <toolset>msvc-7.1:<define>TEST_MFC=1 <toolset>msvc-7.0:<define>TEST_MFC=1
          :  # test name
             $(name)
         ] ;
@@ -33,6 +39,7 @@ test-suite regex-examples :
 [ regex-test-run snippets/mfc_example.cpp ]
 [ regex-test-run snippets/icu_example.cpp ]
 [ regex-test-run snippets/partial_regex_grep.cpp : $(BOOST_ROOT)/libs/regex/index.htm ]
+[ regex-test-run snippets/partial_regex_iterate.cpp : $(BOOST_ROOT)/libs/regex/index.htm ]
 [ regex-test-run snippets/partial_regex_match.cpp : 1234-5678-8765-4 ]
 [ regex-test-run snippets/regex_grep_example_1.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
 [ regex-test-run snippets/regex_grep_example_2.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
@@ -43,9 +50,9 @@ test-suite regex-examples :
 [ regex-test-run snippets/regex_replace_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
 [ regex-test-run snippets/regex_search_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
 [ regex-test-run snippets/regex_split_example_1.cpp : -auto ]
-[ regex-test-run snippets/regex_split_example_2.cpp : $(BOOST_ROOT)/libs/regex/doc/index.html ]
+[ regex-test-run snippets/regex_split_example_2.cpp : $(BOOST_ROOT)/libs/regex/doc/html/index.html ]
 [ regex-test-run snippets/regex_token_iterator_eg_1.cpp : -auto ]
-[ regex-test-run snippets/regex_token_iterator_eg_2.cpp : $(BOOST_ROOT)/libs/regex/doc/index.html ]
+[ regex-test-run snippets/regex_token_iterator_eg_2.cpp : $(BOOST_ROOT)/libs/regex/doc/html/index.html ]
 [ regex-test-run snippets/regex_iterator_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
 [ run snippets/captures_example.cpp
   ../test/captures//boost_regex_extra
@@ -60,3 +67,7 @@ test-suite regex-examples :
 
 
 
+
+
+
+
diff --git a/example/snippets/icu_example.cpp b/example/snippets/icu_example.cpp
index 879b0bfd..8e5f22ca 100644
--- a/example/snippets/icu_example.cpp
+++ b/example/snippets/icu_example.cpp
@@ -43,7 +43,7 @@ std::string get_filename(const std::string& path)
    boost::smatch what;
    if(boost::u32regex_match(path, what, r))
    {
-      // extract $1 as a CString:
+      // extract $1 as a std::string:
       return what.str(1);
    }
    else
@@ -61,7 +61,7 @@ UnicodeString extract_greek(const UnicodeString& text)
    boost::u16match what;
    if(boost::u32regex_search(text, what, r))
    {
-      // extract $0 as a CString:
+      // extract $0 as a UnicodeString:
       return UnicodeString(what[0].first, what.length(0));
    }
    else
diff --git a/example/snippets/partial_regex_iterate.cpp b/example/snippets/partial_regex_iterate.cpp
new file mode 100644
index 00000000..9ebf33d8
--- /dev/null
+++ b/example/snippets/partial_regex_iterate.cpp
@@ -0,0 +1,118 @@
+/*
+ *
+ * Copyright (c) 1998-2007
+ * John Maddock
+ *
+ * Use, modification and distribution are subject to 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         partial_regex_iterate.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Search example using partial matches.
+  */
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <cstring>
+#include <boost/regex.hpp>
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{ using ::memmove; }
+#endif
+
+// 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;
+
+   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);
+      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(
+         buf, 
+         buf + read + leftover, 
+         e, 
+         boost::match_default | boost::match_partial); 
+      boost::cregex_iterator b;
+
+      while(a != b)
+      {
+         if((*a)[0].matched == false)
+         {
+            // Partial match, save position and break:
+            next_pos = (*a)[0].first;
+            break;
+         }
+         else
+         {
+            // full match:
+            ++tags;
+         }
+         
+         // move to next match:
+         ++a;
+      }
+   }
+}
+
+int main(int argc, char* argv[])
+{
+   if(argc > 1)
+   {
+      for(int i = 1; i < argc; ++i)
+      {
+         std::ifstream fs(argv[i]);
+         if(fs.bad()) continue;
+         search(fs);
+         fs.close();
+      }
+   }
+   else
+   {
+      std::string one("<META NAME=\"keywords\" CONTENT=\"regex++, regular expressions, regular expression library, C++\">");
+      std::string what;
+      while(what.size() < 10000)
+      {
+         what.append(one);
+         what.append(13, ' ');
+      }
+      std::stringstream ss;
+      ss.str(what);
+      search(ss);
+   }
+   std::cout << "total tag count was " << tags << std::endl;
+   return 0;
+}
+
+
+
+
diff --git a/example/snippets/regex_split_example_2.cpp b/example/snippets/regex_split_example_2.cpp
index 8a0e6919..7687334a 100644
--- a/example/snippets/regex_split_example_2.cpp
+++ b/example/snippets/regex_split_example_2.cpp
@@ -84,4 +84,3 @@ int main(int argc, char** argv)
 }
 
 
-
diff --git a/example/snippets/regex_token_iterator_eg_2.cpp b/example/snippets/regex_token_iterator_eg_2.cpp
index 5ff1fec8..fa6d2500 100644
--- a/example/snippets/regex_token_iterator_eg_2.cpp
+++ b/example/snippets/regex_token_iterator_eg_2.cpp
@@ -87,4 +87,3 @@ int main(int argc, char** argv)
 }
 
 
-
diff --git a/example/timer/input_script.txt b/example/timer/input_script.txt
index 0c068787..4a9e3e2d 100644
--- a/example/timer/input_script.txt
+++ b/example/timer/input_script.txt
@@ -5,3 +5,10 @@ quit
 100- this is a line of ftp response which contains a message string
 quit
 quit
+
+#  Copyright 2007 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/example/timer/regex_timer.cpp b/example/timer/regex_timer.cpp
index 2b2694c1..834ebfbf 100644
--- a/example/timer/regex_timer.cpp
+++ b/example/timer/regex_timer.cpp
@@ -143,7 +143,7 @@ int main(int argc, char**argv)
    boost::match_results<std::deque<char>::iterator> dm;
    std::string s1, s2, ts;
    std::deque<char> ds;
-   boost::regex_t r;
+   boost::regex_tA r;
    boost::scoped_array<boost::regmatch_t> matches;
    std::size_t nsubs;
    boost::timer t;
@@ -175,12 +175,12 @@ int main(int argc, char**argv)
          cout << "Error in expression: \"" << e.what() << "\"" << endl;
          continue;
       }
-      int code = regcomp(&r, s1.c_str(), boost::REG_PERL);
+      int code = regcompA(&r, s1.c_str(), boost::REG_PERL);
       if(code != 0)
       {
          char buf[256];
-         regerror(code, &r, buf, 256);
-         cout << "regcomp error: \"" << buf << "\"" << endl;
+         regerrorA(code, &r, buf, 256);
+         cout << "regcompA error: \"" << buf << "\"" << endl;
          continue;
       }
       nsubs = r.re_nsub + 1;
@@ -324,17 +324,17 @@ int main(int argc, char**argv)
          iters = 10;
          tim = 1.1;
          // cache load:
-         regexec(&r, s2.c_str(), nsubs, matches.get(), 0);
+         regex_tA(&r, s2.c_str(), nsubs, matches.get(), 0);
          do{
             iters *= (tim > 0.001) ? (1.1/tim) : 100;
             t.restart();
             for(i = 0; i < iters; ++i)
             {
-               result = regexec(&r, s2.c_str(), nsubs, matches.get(), 0);
+               result = regex_tA(&r, s2.c_str(), nsubs, matches.get(), 0);
             }
             tim = t.elapsed();
          }while(tim < wait_time);
-         cout << "POSIX regexec time: " << (tim * 1000000 / iters) << "us" << endl;
+         cout << "POSIX regex_tA time: " << (tim * 1000000 / iters) << "us" << endl;
 
          if(result == 0)
          {
@@ -360,7 +360,7 @@ int main(int argc, char**argv)
             cout << "\" (matched=" << (matches[0].rm_eo != s2.size()) << ")" << endl << endl;
          }
       }
-      regfree(&r);
+      regfreeA(&r);
    }
 
    if(pbuf)
@@ -372,7 +372,7 @@ int main(int argc, char**argv)
    return 0;
 }
 
-#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE)
+#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(UNDER_CE)
 #pragma comment(lib, "user32.lib")
 #endif
 
diff --git a/index.html b/index.html
index 2780fce3..df7430bd 100644
--- a/index.html
+++ b/index.html
@@ -1,10 +1,12 @@
 <html>
    <head>
-      <meta http-equiv="refresh" content="0; URL=doc/index.html">
+      <meta http-equiv="refresh" content="0; URL=doc/html/index.html">
    </head>
    <body>
-      Automatic redirection failed, please go to <A href="doc/index.html">doc/index.html</A>.
-      <P>Copyright&nbsp;John Maddock 2003</P>
+      <P>
+         Automatic redirection failed, please go to <a href="doc/html/index.html">doc/html/index.html</a>.
+      </P>
+      <P>Copyright&nbsp;John Maddock 2001</P>
       <P>Distributed under the Boost Software License, Version 1.0. (See accompanying file <A href="../../LICENSE_1_0.txt">
             LICENSE_1_0.txt</A> or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</A>).</P>
    </body>
diff --git a/src/cregex.cpp b/src/cregex.cpp
index 2a9adc26..99d48a7b 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -19,8 +19,8 @@
 
 #define BOOST_REGEX_SOURCE
 
-#include <boost/cregex.hpp>
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 #if !defined(BOOST_NO_STD_STRING)
 #include <map>
 #include <list>
@@ -354,7 +354,7 @@ void BuildFileList(std::list<std::string>* pl, const char* files, bool recurse)
 
       while(dstart != dend)
       {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
          (::sprintf_s)(buf, sizeof(buf), "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);
 #else
          (std::sprintf)(buf, "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);
diff --git a/src/fileiter.cpp b/src/fileiter.cpp
index cbb46c01..7d9c7f88 100644
--- a/src/fileiter.cpp
+++ b/src/fileiter.cpp
@@ -86,7 +86,14 @@ const char* _fi_sep_alt = _fi_sep;
 
 void mapfile::open(const char* file)
 {
-#if defined(__CYGWIN__)||defined(__CYGWIN32__)
+#if defined(BOOST_NO_ANSI_APIS)
+   int filename_size = strlen(file);
+   LPWSTR wide_file = (LPWSTR)_alloca( (filename_size + 1) * sizeof(WCHAR) );
+   if(::MultiByteToWideChar(CP_ACP, 0,  file, filename_size,  wide_file, filename_size + 1) == 0)
+      hfile = INVALID_HANDLE_VALUE;
+   else
+      hfile = CreateFileW(wide_file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+#elif defined(__CYGWIN__)||defined(__CYGWIN32__)
    char win32file[ MAX_PATH ];
    cygwin_conv_to_win32_path( file, win32file );
    hfile = CreateFileA(win32file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
@@ -350,6 +357,48 @@ void mapfile::close()
 
 #endif
 
+inline _fi_find_handle find_first_file(const char* wild,  _fi_find_data& data)
+{
+#ifdef BOOST_NO_ANSI_APIS
+   std::size_t wild_size = std::strlen(wild);
+   LPWSTR wide_wild = (LPWSTR)_alloca( (wild_size + 1) * sizeof(WCHAR) );
+   if (::MultiByteToWideChar(CP_ACP, 0,  wild, wild_size,  wide_wild, wild_size + 1) == 0)
+      return _fi_invalid_handle;
+
+   return FindFirstFileW(wide_wild, &data);
+#else
+   return FindFirstFileA(wild, &data);
+#endif
+}
+
+inline bool find_next_file(_fi_find_handle hf,  _fi_find_data& data)
+{
+#ifdef BOOST_NO_ANSI_APIS
+   return FindNextFileW(hf, &data);
+#else
+   return FindNextFileA(hf, &data);
+#endif
+}
+   
+inline void copy_find_file_result_with_overflow_check(const _fi_find_data& data,  char* path, size_t max_size)
+{
+#ifdef BOOST_NO_ANSI_APIS
+   if (::WideCharToMultiByte(CP_ACP, 0,  data.cFileName, -1,  path, max_size,  NULL, NULL) == 0)
+      re_detail::overflow_error_if_not_zero(1);
+#else
+   re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(path, max_size,  data.cFileName));
+#endif
+}
+
+inline bool is_not_current_or_parent_path_string(const _fi_find_data& data)
+{
+#ifdef BOOST_NO_ANSI_APIS
+   return (std::wcscmp(data.cFileName, L".") && std::wcscmp(data.cFileName, L".."));
+#else
+   return (std::strcmp(data.cFileName, ".") && std::strcmp(data.cFileName, ".."));
+#endif
+}
+
 
 file_iterator::file_iterator()
 {
@@ -413,7 +462,7 @@ file_iterator::file_iterator(const char* wild)
 
    ref = new file_iterator_ref();
    BOOST_REGEX_NOEH_ASSERT(ref)
-   ref->hf = FindFirstFileA(wild, &(ref->_data));
+   ref->hf = find_first_file(wild,  ref->_data);
    ref->count = 1;
 
    if(ref->hf == _fi_invalid_handle)
@@ -423,7 +472,7 @@ file_iterator::file_iterator(const char* wild)
    }
    else
    {
-      re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, (MAX_PATH - (ptr - _path)), ref->_data.cFileName));
+      copy_find_file_result_with_overflow_check(ref->_data,  ptr, (MAX_PATH - (ptr - _path)));
       if(ref->_data.dwFileAttributes & _fi_dir)
          next();
    }
@@ -510,7 +559,7 @@ void file_iterator::next()
       bool cont = true;
       while(cont)
       {
-         cont = FindNextFileA(ref->hf, &(ref->_data));
+         cont = find_next_file(ref->hf, ref->_data);
          if(cont && ((ref->_data.dwFileAttributes & _fi_dir) == 0))
             break;
       }
@@ -523,7 +572,7 @@ void file_iterator::next()
          ptr = _path;
       }
       else
-         re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, MAX_PATH - (ptr - _path), ref->_data.cFileName));
+         copy_find_file_result_with_overflow_check(ref->_data,  ptr, MAX_PATH - (ptr - _path));
    }
 }
 
@@ -593,7 +642,7 @@ directory_iterator::directory_iterator(const char* wild)
    ref = new file_iterator_ref();
    BOOST_REGEX_NOEH_ASSERT(ref)
    ref->count = 1;
-   ref->hf = FindFirstFileA(wild, &(ref->_data));
+   ref->hf = find_first_file(wild,  ref->_data);
    if(ref->hf == _fi_invalid_handle)
    {
       *_path = 0;
@@ -601,8 +650,8 @@ directory_iterator::directory_iterator(const char* wild)
    }
    else
    {
-      re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, MAX_PATH - (ptr - _path), ref->_data.cFileName));
-      if(((ref->_data.dwFileAttributes & _fi_dir) == 0) || (std::strcmp(ref->_data.cFileName, ".") == 0) || (std::strcmp(ref->_data.cFileName, "..") == 0))
+      copy_find_file_result_with_overflow_check(ref->_data,  ptr, MAX_PATH - (ptr - _path));
+      if(((ref->_data.dwFileAttributes & _fi_dir) == 0) || (std::strcmp(ptr, ".") == 0) || (std::strcmp(ptr, "..") == 0))
          next();
    }
 #ifndef BOOST_NO_EXCEPTIONS
@@ -686,10 +735,10 @@ void directory_iterator::next()
       bool cont = true;
       while(cont)
       {
-         cont = FindNextFileA(ref->hf, &(ref->_data));
+         cont = find_next_file(ref->hf, ref->_data);
          if(cont && (ref->_data.dwFileAttributes & _fi_dir))
          {
-            if(std::strcmp(ref->_data.cFileName, ".") && std::strcmp(ref->_data.cFileName, ".."))
+            if(is_not_current_or_parent_path_string(ref->_data))
                break;
          }
       }
@@ -702,7 +751,7 @@ void directory_iterator::next()
          ptr = _path;
       }
       else
-         re_detail::overflow_error_if_not_zero(re_detail::strcpy_s(ptr, MAX_PATH - (ptr - _path), ref->_data.cFileName));
+         copy_find_file_result_with_overflow_check(ref->_data,  ptr, MAX_PATH - (ptr - _path));
    }
 }
 
diff --git a/src/posix_api.cpp b/src/posix_api.cpp
index 64cb5dc2..907c60c3 100644
--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@@ -19,8 +19,8 @@
 #define BOOST_REGEX_SOURCE
 
 #include <cstdio>
-#include <boost/cregex.hpp>
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{
@@ -164,7 +164,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
       {
          if(std::strcmp(e->re_endp, names[i]) == 0)
          {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
             (::sprintf_s)(localbuf, 5, "%d", i);
 #else
             (std::sprintf)(localbuf, "%d", i);
@@ -174,7 +174,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
             return std::strlen(localbuf) + 1;
          }
       }
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
       (::sprintf_s)(localbuf, 5, "%d", 0);
 #else
       (std::sprintf)(localbuf, "%d", 0);
diff --git a/src/static_mutex.cpp b/src/static_mutex.cpp
index b01f9f0d..cef76783 100644
--- a/src/static_mutex.cpp
+++ b/src/static_mutex.cpp
@@ -155,7 +155,7 @@ void scoped_static_mutex_lock::lock()
 {
    if(0 == m_have_lock)
    {
-      boost::call_once(&static_mutex::init, static_mutex::m_once);
+       boost::call_once(static_mutex::m_once,&static_mutex::init);
       if(0 == m_plock)
          m_plock = new boost::recursive_mutex::scoped_lock(*static_mutex::m_pmutex, false);
       m_plock->lock();
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index 64fd2ce4..365fccc0 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -30,7 +30,7 @@
 #define NOGDI
 #include <windows.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
 #pragma comment(lib, "user32.lib")
 #endif
 
@@ -42,6 +42,18 @@ namespace std{
 
 namespace boost{ namespace re_detail{
 
+#ifdef BOOST_NO_ANSI_APIS
+UINT get_code_page_for_locale_id(lcid_type id)
+{
+   WCHAR code_page_string[7];
+   if (::GetLocaleInfoW(id, LOCALE_IDEFAULTANSICODEPAGE, code_page_string, 7) == 0)
+       return 0;
+
+   return static_cast<UINT>(_wtol(code_page_string));
+}
+#endif
+
+
 void w32_regex_traits_char_layer<char>::init() 
 {
    // we need to start by initialising our syntax map so we know which
@@ -106,8 +118,24 @@ void w32_regex_traits_char_layer<char>::init()
    char char_map[1 << CHAR_BIT];
    for(int ii = 0; ii < (1 << CHAR_BIT); ++ii)
       char_map[ii] = static_cast<char>(ii);
+#ifndef BOOST_NO_ANSI_APIS
    int r = ::LCMapStringA(this->m_locale, LCMAP_LOWERCASE, char_map, 1 << CHAR_BIT, this->m_lower_map, 1 << CHAR_BIT);
    BOOST_ASSERT(r != 0);
+#else
+   UINT code_page = get_code_page_for_locale_id(this->m_locale);
+   BOOST_ASSERT(code_page != 0);
+
+   WCHAR wide_char_map[1 << CHAR_BIT];
+   int conv_r = ::MultiByteToWideChar(code_page, 0,  char_map, 1 << CHAR_BIT,  wide_char_map, 1 << CHAR_BIT);
+   BOOST_ASSERT(conv_r != 0);
+
+   WCHAR wide_lower_map[1 << CHAR_BIT];
+   int r = ::LCMapStringW(this->m_locale, LCMAP_LOWERCASE,  wide_char_map, 1 << CHAR_BIT,  wide_lower_map, 1 << CHAR_BIT);
+   BOOST_ASSERT(r != 0);
+
+   conv_r = ::WideCharToMultiByte(code_page, 0,  wide_lower_map, r,  this->m_lower_map, 1 << CHAR_BIT,  NULL, NULL);
+   BOOST_ASSERT(conv_r != 0);
+#endif
    if(r < (1 << CHAR_BIT))
    {
       // if we have multibyte characters then not all may have been given
@@ -115,7 +143,12 @@ void w32_regex_traits_char_layer<char>::init()
       for(int jj = r; jj < (1 << CHAR_BIT); ++jj)
          this->m_lower_map[jj] = static_cast<char>(jj);
    }
+
+#ifndef BOOST_NO_ANSI_APIS
    r = ::GetStringTypeExA(this->m_locale, CT_CTYPE1, char_map, 1 << CHAR_BIT, this->m_type_map);
+#else
+   r = ::GetStringTypeExW(this->m_locale, CT_CTYPE1, wide_char_map, 1 << CHAR_BIT, this->m_type_map);
+#endif
    BOOST_ASSERT(0 != r);
 }
 
@@ -126,10 +159,25 @@ BOOST_REGEX_DECL lcid_type BOOST_REGEX_CALL w32_get_default_locale()
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(char c, lcid_type id)
 {
+#ifndef BOOST_NO_ANSI_APIS
    WORD mask;
    if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_LOWER))
       return true;
    return false;
+#else
+   UINT code_page = get_code_page_for_locale_id(id);
+   if (code_page == 0)
+       return false;
+
+   WCHAR wide_c;
+   if (::MultiByteToWideChar(code_page, 0,  &c, 1,  &wide_c, 1) == 0)
+       return false;
+
+   WORD mask;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &wide_c, 1, &mask) && (mask & C1_LOWER))
+      return true;
+   return false;
+#endif
 }
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(wchar_t c, lcid_type id)
@@ -152,10 +200,25 @@ BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(unsigned short ca, lcid_type
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(char c, lcid_type id)
 {
+#ifndef BOOST_NO_ANSI_APIS
    WORD mask;
    if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_UPPER))
       return true;
    return false;
+#else
+   UINT code_page = get_code_page_for_locale_id(id);
+   if (code_page == 0)
+       return false;
+
+   WCHAR wide_c;
+   if (::MultiByteToWideChar(code_page, 0,  &c, 1,  &wide_c, 1) == 0)
+       return false;
+
+   WORD mask;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &wide_c, 1, &mask) && (mask & C1_UPPER))
+      return true;
+   return false;
+#endif
 }
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(wchar_t c, lcid_type id)
@@ -183,12 +246,22 @@ void free_module(void* mod)
 
 BOOST_REGEX_DECL cat_type BOOST_REGEX_CALL w32_cat_open(const std::string& name)
 {
+#ifndef BOOST_NO_ANSI_APIS
    cat_type result(::LoadLibraryA(name.c_str()), &free_module);
    return result;
+#else
+   LPWSTR wide_name = (LPWSTR)_alloca( (name.size() + 1) * sizeof(WCHAR) );
+   if (::MultiByteToWideChar(CP_ACP, 0,  name.c_str(), name.size(),  wide_name, name.size() + 1) == 0)
+       return cat_type();
+
+   cat_type result(::LoadLibraryW(wide_name), &free_module);
+   return result;
+#endif
 }
 
 BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::string& def)
 {
+#ifndef BOOST_NO_ANSI_APIS
    char buf[256];
    if(0 == ::LoadStringA(
       static_cast<HMODULE>(cat.get()),
@@ -199,6 +272,21 @@ BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, l
    {
       return def;
    }
+#else
+   WCHAR wbuf[256];
+   int r = ::LoadStringW(
+      static_cast<HMODULE>(cat.get()),
+      i,
+      wbuf,
+      256
+   );
+   if (r == 0)
+      return def;
+
+   LPSTR buf = (LPSTR)_alloca( (r + 1) * 2 );
+   if (::WideCharToMultiByte(CP_ACP, 0,  wbuf, r,  buf, (r + 1) * 2,  NULL, NULL) == 0)
+      return def;
+#endif
    return std::string(buf);
 }
 
@@ -236,6 +324,7 @@ BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_cat_get(
 #endif
 BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_transform(lcid_type id, const char* p1, const char* p2)
 {
+#ifndef BOOST_NO_ANSI_APIS
    int bytes = ::LCMapStringA(
       id,       // locale identifier
       LCMAP_SORTKEY,  // mapping transformation type
@@ -255,6 +344,36 @@ BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_transform(lcid_type id, const
       &*result.begin(),  // destination buffer
       bytes        // size of destination buffer
       );
+#else
+   UINT code_page = get_code_page_for_locale_id(id);
+   if(code_page == 0)
+      return std::string(p1, p2);
+
+   int src_len = static_cast<int>(p2 - p1);
+   LPWSTR wide_p1 = (LPWSTR)_alloca( (src_len + 1) * 2 );
+   if(::MultiByteToWideChar(code_page, 0,  p1, src_len,  wide_p1, src_len + 1) == 0)
+      return std::string(p1, p2);
+
+   int bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      wide_p1,  // source string
+      src_len,        // number of characters in source string
+      0,  // destination buffer
+      0        // size of destination buffer
+      );
+   if(!bytes)
+      return std::string(p1, p2);
+   std::string result(++bytes, '\0');
+   bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      wide_p1,  // source string
+      src_len,        // number of characters in source string
+      (LPWSTR)&*result.begin(),  // destination buffer
+      bytes        // size of destination buffer
+      );
+#endif
    if(bytes > static_cast<int>(result.size()))
       return std::string(p1, p2);
    while(result.size() && result[result.size()-1] == '\0')
@@ -335,6 +454,7 @@ BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_transfor
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_tolower(char c, lcid_type id)
 {
    char result[2];
+#ifndef BOOST_NO_ANSI_APIS
    int b = ::LCMapStringA(
       id,       // locale identifier
       LCMAP_LOWERCASE,  // mapping transformation type
@@ -344,6 +464,29 @@ BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_tolower(char c, lcid_type id)
       1);        // size of destination buffer
    if(b == 0)
       return c;
+#else
+   UINT code_page = get_code_page_for_locale_id(id);
+   if (code_page == 0)
+      return c;
+
+   WCHAR wide_c;
+   if (::MultiByteToWideChar(code_page, 0,  &c, 1,  &wide_c, 1) == 0)
+      return c;
+
+   WCHAR wide_result;
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_LOWERCASE,  // mapping transformation type
+      &wide_c,  // source string
+      1,        // number of characters in source string
+      &wide_result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+
+   if (::WideCharToMultiByte(code_page, 0,  &wide_result, 1,  result, 2,  NULL, NULL) == 0)
+       return c;
+#endif
    return result[0];
 }
 
@@ -382,6 +525,7 @@ BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_tolower(unsigned short c, l
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_toupper(char c, lcid_type id)
 {
    char result[2];
+#ifndef BOOST_NO_ANSI_APIS
    int b = ::LCMapStringA(
       id,       // locale identifier
       LCMAP_UPPERCASE,  // mapping transformation type
@@ -391,6 +535,29 @@ BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_toupper(char c, lcid_type id)
       1);        // size of destination buffer
    if(b == 0)
       return c;
+#else
+   UINT code_page = get_code_page_for_locale_id(id);
+   if(code_page == 0)
+       return c;
+
+   WCHAR wide_c;
+   if (::MultiByteToWideChar(code_page, 0,  &c, 1,  &wide_c, 1) == 0)
+       return c;
+
+   WCHAR wide_result;
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_UPPERCASE,  // mapping transformation type
+      &wide_c,  // source string
+      1,        // number of characters in source string
+      &wide_result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+
+   if (::WideCharToMultiByte(code_page, 0,  &wide_result, 1,  result, 2,  NULL, NULL) == 0)
+       return c;
+#endif
    return result[0];
 }
 
@@ -429,8 +596,21 @@ BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_toupper(unsigned short c, l
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, char c)
 {
    WORD mask;
+#ifndef BOOST_NO_ANSI_APIS
    if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & m & w32_regex_traits_implementation<char>::mask_base))
       return true;
+#else
+   UINT code_page = get_code_page_for_locale_id(id);
+   if(code_page == 0)
+       return false;
+
+   WCHAR wide_c;
+   if (::MultiByteToWideChar(code_page, 0,  &c, 1,  &wide_c, 1) == 0)
+       return false;
+
+   if(::GetStringTypeExW(id, CT_CTYPE1, &wide_c, 1, &mask) && (mask & m & w32_regex_traits_implementation<char>::mask_base))
+      return true;
+#endif
    if((m & w32_regex_traits_implementation<char>::mask_word) && (c == '_'))
       return true;
    return false;
diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp
index 0673e17d..184b1cea 100644
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@@ -22,8 +22,8 @@
 
 #ifndef BOOST_NO_WREGEX
 
-#include <boost/cregex.hpp>
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #include <cwchar>
 #include <cstring>
@@ -157,7 +157,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
       {
          result = std::wcslen(wnames[code]) + 1;
          if(buf_size >= result)
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
             ::wcscpy_s(buf, buf_size, wnames[code]);
 #else
             std::wcscpy(buf, wnames[code]);
@@ -176,9 +176,13 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
       {
          if(std::wcscmp(e->re_endp, wnames[i]) == 0)
          {
+#if defined(_WIN32_WCE) && !defined(UNDER_CE)
+            (std::swprintf)(localbuf, L"%d", i);
+#else
             (std::swprintf)(localbuf, 5, L"%d", i);
+#endif
             if(std::wcslen(localbuf) < buf_size)
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
                ::wcscpy_s(buf, buf_size, localbuf);
 #else
                std::wcscpy(buf, localbuf);
@@ -186,9 +190,13 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
             return std::wcslen(localbuf) + 1;
          }
       }
+#if defined(_WIN32_WCE) && !defined(UNDER_CE)
+      (std::swprintf)(localbuf, L"%d", 0);
+#else
       (std::swprintf)(localbuf, 5, L"%d", 0);
+#endif
       if(std::wcslen(localbuf) < buf_size)
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
          ::wcscpy_s(buf, buf_size, localbuf);
 #else
          std::wcscpy(buf, localbuf);
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 6feb981e..4d1a2967 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -4,7 +4,14 @@
 # http://www.boost.org/LICENSE_1_0.txt.
 
 project
-    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+    : requirements 
+      <threading>multi 
+      <link>shared:<define>BOOST_REGEX_DYN_LINK=1 
+      <toolset>msvc-7.1:<define>TEST_MFC=1 
+      <toolset>msvc-7.0:<define>TEST_MFC=1
+      # There are unidentified linker problems on these platforms:
+      <toolset>mipspro-7.4:<link>static
+      <toolset>sun-5.9:<link>static
     ;
 
 #
@@ -48,21 +55,14 @@ local regress-sources = regress/$(R_SOURCE) ;
 
 test-suite regex
       : 
-      [ run regress/$(R_SOURCE) ../build//boost_regex      
+      [ run regress/$(R_SOURCE) ../build//boost_regex ../build//icu_options
         : # command line
         : # input files
         : # requirements
-	  <link>static
         : regex_regress ]
 
       [ run regress/$(R_SOURCE) ../build//boost_regex
-        : # command line
-        : # input files
-        : # requirements
-        : regex_regress_dll ]
-
-      [ run regress/$(R_SOURCE) ../build//boost_regex
-                                ../../thread/build//boost_thread
+                                ../../thread/build//boost_thread ../build//icu_options
         : # command line
         : # input files
         : # requirements
@@ -132,5 +132,3 @@ test-suite regex
 ;
       
 
-
-
diff --git a/test/auto-link-test/Jamfile b/test/auto-link-test/Jamfile
new file mode 100644
index 00000000..dab1b0ed
--- /dev/null
+++ b/test/auto-link-test/Jamfile
@@ -0,0 +1,81 @@
+# copyright John Maddock 2003
+# 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.
+
+#
+# This Jamfile tests the ability of some Windows compilers
+# to automatically link to the right lib file,
+# it is not generally applicable.
+#
+
+R_SOURCE = 
+basic_tests.cpp
+main.cpp
+test_alt.cpp
+test_anchors.cpp
+test_asserts.cpp
+test_backrefs.cpp
+test_deprecated.cpp
+test_emacs.cpp
+test_escapes.cpp
+test_grep.cpp
+test_locale.cpp
+test_mfc.cpp
+test_non_greedy_repeats.cpp
+test_perl_ex.cpp
+test_replace.cpp
+test_sets.cpp
+test_simple_repeats.cpp
+test_tricky_cases.cpp
+test_icu.cpp
+test_unicode.cpp
+test_overloads.cpp
+test_operators.cpp
+;
+
+
+subproject libs/regex/test/auto-link-test ;
+
+# bring in the rules for testing
+import testing ;
+
+run 
+   # sources
+   <template>../../build/regex-options
+   <template>../../build/regex-test-options
+   ../regress/$(R_SOURCE)
+:
+:  # input files
+   ../regress/tests.txt
+:  # requirements
+   <library-path>../../../../stage/lib
+   <define>BOOST_LIB_DIAGNOSTIC=1
+:  # program name
+   regex_regress
+;
+
+# and now the dll versions:
+
+run 
+   # sources
+   <template>../../build/regex-options
+   <template>../../build/regex-test-options
+   ../regress/$(R_SOURCE)
+:
+:  # input files
+   ../regress/tests.txt
+:  # requirements
+   <library-path>../../../../stage/lib
+   <define>BOOST_ALL_DYN_LINK=1
+   <runtime-link>dynamic
+   <define>BOOST_LIB_DIAGNOSTIC=1
+:  # program name
+   regex_regress_dll
+;
+
+
+
+
+
+
diff --git a/test/c_compiler_checks/posix_api_check.c b/test/c_compiler_checks/posix_api_check.c
index 2653a981..b7498aaa 100644
--- a/test/c_compiler_checks/posix_api_check.c
+++ b/test/c_compiler_checks/posix_api_check.c
@@ -32,30 +32,30 @@ int flags = REG_EXTENDED | REG_BASIC | REG_NOSPEC | REG_ICASE | REG_NOSUB |
 
 int main()
 {
-   regex_t re;
+   regex_tA re;
    int result;
-   result = regcomp(&re, expression, REG_AWK);
+   result = regcompA(&re, expression, REG_AWK);
    if(result > REG_NOERROR)
    {
       char buf[256];
-      regerror(result, &re, buf, sizeof(buf));
+      regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
       return result;
    }
    assert(re.re_nsub == 0);
    matches[0].rm_so = 0;
    matches[0].rm_eo = strlen(text);
-   result = regexec(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
+   result = regexecA(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
    if(result > REG_NOERROR)
    {
       char buf[256];
-      regerror(result, &re, buf, sizeof(buf));
+      regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
-      regfree(&re);
+      regfreeA(&re);
       return result;
    }
    assert(matches[0].rm_so == matches[0].rm_eo == 1);
-   regfree(&re);
+   regfreeA(&re);
    printf("no errors found\n");
    return 0;
 }
diff --git a/test/c_compiler_checks/posix_api_check.cpp b/test/c_compiler_checks/posix_api_check.cpp
index 46d8aed9..9a94c651 100644
--- a/test/c_compiler_checks/posix_api_check.cpp
+++ b/test/c_compiler_checks/posix_api_check.cpp
@@ -33,30 +33,30 @@ int flags = REG_EXTENDED | REG_BASIC | REG_NOSPEC | REG_ICASE | REG_NOSUB |
 
 int main()
 {
-   regex_t re;
+   regex_tA re;
    int result;
-   result = regcomp(&re, expression, REG_AWK);
+   result = regcompA(&re, expression, REG_AWK);
    if(result > REG_NOERROR)
    {
       char buf[256];
-      regerror(result, &re, buf, sizeof(buf));
+      regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
       return result;
    }
    BOOST_TEST(re.re_nsub == 0);
    matches[0].rm_so = 0;
    matches[0].rm_eo = strlen(text);
-   result = regexec(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
+   result = regexecA(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
    if(result > REG_NOERROR)
    {
       char buf[256];
-      regerror(result, &re, buf, sizeof(buf));
+      regerrorA(result, &re, buf, sizeof(buf));
       printf(buf);
-      regfree(&re);
+      regfreeA(&re);
       return result;
    }
    BOOST_TEST(matches[0].rm_so == matches[0].rm_eo == 1);
-   regfree(&re);
+   regfreeA(&re);
    printf("no errors found\n");
    return boost::report_errors();
 }
diff --git a/test/profile/Makefile b/test/profile/Makefile
index f3006bd7..f1b3def7 100644
--- a/test/profile/Makefile
+++ b/test/profile/Makefile
@@ -1,4 +1,4 @@
-# copyright John Maddock 2005
+# copyright John Maddock 2003
 # 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/test/regress/info.hpp b/test/regress/info.hpp
index 2b276693..4fa55afa 100644
--- a/test/regress/info.hpp
+++ b/test/regress/info.hpp
@@ -67,7 +67,7 @@ private:
    {
 #ifdef TEST_THREADS
       static boost::once_flag f = BOOST_ONCE_INIT;
-      boost::call_once(&init_data, f);
+      boost::call_once(f,&init_data);
       return do_get_data();
 #else
       static data_type d;
diff --git a/test/regress/main.cpp b/test/regress/main.cpp
index b157caab..f3324c24 100644
--- a/test/regress/main.cpp
+++ b/test/regress/main.cpp
@@ -70,12 +70,25 @@ void run_tests()
 int cpp_main(int /*argc*/, char * /*argv*/[])
 {
 #ifdef TEST_THREADS
-   get_array_data();  // initialises data.
+   try{
+      get_array_data();  // initialises data.
+   }
+   catch(const std::exception& e)
+   {
+      std::cerr << "TSS Initialisation failed with message: " << e.what() << std::endl;
+      return -1;
+   }
 
    std::list<boost::shared_ptr<boost::thread> > threads;
    for(int i = 0; i < 5; ++i)
    {
-      threads.push_back(boost::shared_ptr<boost::thread>(new boost::thread(&run_tests)));
+      try{
+         threads.push_back(boost::shared_ptr<boost::thread>(new boost::thread(&run_tests)));
+      }
+      catch(const std::exception& e)
+      {
+         std::cerr << "<note>Thread creation failed with message: " << e.what() << "</note>" << std::endl;
+      }
    }
    std::list<boost::shared_ptr<boost::thread> >::const_iterator a(threads.begin()), b(threads.end());
    while(a != b)
diff --git a/test/regress/test.hpp b/test/regress/test.hpp
index 0b82c9e1..046b2d56 100644
--- a/test/regress/test.hpp
+++ b/test/regress/test.hpp
@@ -261,4 +261,3 @@ void test_unicode();
 
 
 #endif
-
diff --git a/test/regress/test_anchors.cpp b/test/regress/test_anchors.cpp
index 9fab46cc..b2aabdfd 100644
--- a/test/regress/test_anchors.cpp
+++ b/test/regress/test_anchors.cpp
@@ -19,13 +19,13 @@ void test_anchors()
 {
    // line anchors:
    using namespace boost::regex_constants;
-   TEST_REGEX_SEARCH("^ab", extended, "ab", match_default, make_array(0, 2, -2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xxabxx", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xx\nabzz", match_default, make_array(3, 5, -2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab", match_default, make_array(0, 2, -2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "abxx", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab\nzz", match_default, make_array(0, 2, -2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "\n\n  a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xxabxx", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xx\nabzz", match_default, make_array(3, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "abxx", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab\nzz", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "\n\n  a", match_default, make_array(-2, -2));
 
    TEST_REGEX_SEARCH("^ab", basic, "ab", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("^ab", basic, "xxabxx", match_default, make_array(-2, -2));
@@ -34,34 +34,34 @@ void test_anchors()
    TEST_REGEX_SEARCH("ab$", basic, "abxx", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("ab$", basic, "ab\nzz", match_default, make_array(0, 2, -2, -2));
 
-   TEST_REGEX_SEARCH("^ab", extended, "ab", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xxabxx", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xx\nabzz", match_default | match_not_bol | match_not_eol, make_array(3, 5, -2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "abxx", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab\nzz", match_default | match_not_bol | match_not_eol, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "ab", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xxabxx", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xx\nabzz", match_default | match_not_bol | match_not_eol, make_array(3, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "abxx", match_default | match_not_bol | match_not_eol, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab\nzz", match_default | match_not_bol | match_not_eol, make_array(0, 2, -2, -2));
 
-   TEST_REGEX_SEARCH("^ab", extended, "ab", match_default | match_single_line, make_array(0, 2, -2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xxabxx", match_default | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xx\nabzz", match_default | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab", match_default | match_single_line, make_array(0, 2, -2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "abxx", match_default | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab\nzz", match_default | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "ab", match_default | match_single_line, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xxabxx", match_default | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xx\nabzz", match_default | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab", match_default | match_single_line, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "abxx", match_default | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab\nzz", match_default | match_single_line, make_array(-2, -2));
 
-   TEST_REGEX_SEARCH("^ab", extended, "ab", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xxabxx", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("^ab", extended, "xx\nabzz", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "abxx", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
-   TEST_REGEX_SEARCH("ab$", extended, "ab\nzz", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "ab", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xxabxx", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", boost::regex::extended, "xx\nabzz", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "abxx", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab$", boost::regex::extended, "ab\nzz", match_default | match_not_bol | match_not_eol | match_single_line, make_array(-2, -2));
    //
    // changes to newline handling with 2.11:
    //
-   TEST_REGEX_SEARCH("^.", extended, "  \n  \r\n  ", match_default, make_array(0, 1, -2, 3, 4, -2, 7, 8, -2, -2));
-   TEST_REGEX_SEARCH(".$", extended, "  \n  \r\n  ", match_default, make_array(1, 2, -2, 4, 5, -2, 8, 9, -2, -2));
+   TEST_REGEX_SEARCH("^.", boost::regex::extended, "  \n  \r\n  ", match_default, make_array(0, 1, -2, 3, 4, -2, 7, 8, -2, -2));
+   TEST_REGEX_SEARCH(".$", boost::regex::extended, "  \n  \r\n  ", match_default, make_array(1, 2, -2, 4, 5, -2, 8, 9, -2, -2));
 #if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
-   TEST_REGEX_SEARCH_W(L"^.", extended, L"\x2028 \x2028", match_default, make_array(0, 1, -2, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH_W(L".$", extended, L" \x2028 \x2028", match_default, make_array(0, 1, -2, 2, 3, -2, 3, 4, -2, -2));
+   TEST_REGEX_SEARCH_W(L"^.", boost::regex::extended, L"\x2028 \x2028", match_default, make_array(0, 1, -2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH_W(L".$", boost::regex::extended, L" \x2028 \x2028", match_default, make_array(0, 1, -2, 2, 3, -2, 3, 4, -2, -2));
 #endif
 }
 
diff --git a/test/regress/test_escapes.cpp b/test/regress/test_escapes.cpp
index 73cc9800..aa842130 100644
--- a/test/regress/test_escapes.cpp
+++ b/test/regress/test_escapes.cpp
@@ -38,8 +38,8 @@ void test_character_escapes()
    TEST_REGEX_SEARCH("\\c@", perl, "\0", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("\\cA", perl, "\x1", match_default, make_array(0, 1, -2, -2));
    //TEST_REGEX_SEARCH("\\cz", perl, "\x3A", match_default, make_array(0, 1, -2, -2));
-   //TEST_INVALID_REGEX("\\c=", extended);
-   //TEST_INVALID_REGEX("\\c?", extended);
+   //TEST_INVALID_REGEX("\\c=", boost::regex::extended);
+   //TEST_INVALID_REGEX("\\c?", boost::regex::extended);
    TEST_REGEX_SEARCH("=:", perl, "=:", match_default, make_array(0, 2, -2, -2));
 
    TEST_REGEX_SEARCH("\\e", perl, "\x1B", match_default, make_array(0, 1, -2, -2));
@@ -67,8 +67,8 @@ void test_character_escapes()
    // unknown escape sequences match themselves:
    TEST_REGEX_SEARCH("\\~", perl, "~", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("\\~", basic, "~", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\~", extended, "~", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\j", extended, "j", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\~", boost::regex::extended, "~", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\j", boost::regex::extended, "j", match_default, make_array(0, 1, -2, -2));
 }
 
 void test_assertion_escapes()
diff --git a/test/regress/test_icu.cpp b/test/regress/test_icu.cpp
index fc470653..88d6fe4a 100644
--- a/test/regress/test_icu.cpp
+++ b/test/regress/test_icu.cpp
@@ -647,4 +647,3 @@ void test_icu(const wchar_t&, const test_invalid_regex_tag&){}
 void test_icu(const wchar_t&, const test_regex_replace_tag&){}
 
 #endif
-
diff --git a/test/regress/test_locale.cpp b/test/regress/test_locale.cpp
index 1eb37cc4..7bbefa4e 100644
--- a/test/regress/test_locale.cpp
+++ b/test/regress/test_locale.cpp
@@ -26,6 +26,7 @@ namespace std{ using ::setlocale; }
 
 test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
 {
+#ifndef UNDER_CE
    // store the name:
    m_old_name = m_name;
    m_name = c_name;
@@ -43,6 +44,9 @@ test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
       s_c_locale = no_test;
       std::cout << "The global C locale: " << c_name << " is not available and will not be tested." << std::endl;
    }
+#else
+  s_c_locale = no_test;
+#endif
 #ifndef BOOST_NO_STD_LOCALE
    // back up the C++ locale and create the new one:
    m_old_cpp_locale = s_cpp_locale_inst;
@@ -69,6 +73,7 @@ test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
    // Start by geting the printable name of the locale.
    // We use this for debugging purposes only:
    //
+#ifndef BOOST_NO_ANSI_APIS
    boost::scoped_array<char> p;
    int r = ::GetLocaleInfoA(
                lcid,               // locale identifier
@@ -83,6 +88,43 @@ test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
                p.get(),            // information buffer
                r+1                 // size of buffer
             );
+#else
+   WCHAR code_page_string[7];
+   int r = ::GetLocaleInfoW(
+               lcid, 
+               LOCALE_IDEFAULTANSICODEPAGE, 
+               code_page_string, 
+               7);
+   BOOST_ASSERT(r != 0);
+
+   UINT code_page = static_cast<UINT>(_wtol(code_page_string));
+
+   boost::scoped_array<wchar_t> wp;
+   r = ::GetLocaleInfoW(
+               lcid,               // locale identifier
+               LOCALE_SCOUNTRY,    // information type
+               0,                  // information buffer
+               0                   // size of buffer
+            );
+   wp.reset(new wchar_t[r+1]);
+   r = ::GetLocaleInfoW(
+               lcid,               // locale identifier
+               LOCALE_SCOUNTRY,    // information type
+               wp.get(),            // information buffer
+               r+1                 // size of buffer
+            );
+
+   int name_size = (r+1) * 2;
+   boost::scoped_array<char> p(new char[name_size]);
+   int conv_r = ::WideCharToMultiByte(
+               code_page, 
+               0,  
+               wp.get(), r,  
+               p.get(), name_size,  
+               NULL, NULL
+            );
+   BOOST_ASSERT(conv_r != 0);
+#endif
    //
    // now see if locale is installed and behave accordingly:
    //
@@ -104,8 +146,10 @@ test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
 test_locale::~test_locale()
 {
    // restore to previous state:
+#ifndef UNDER_CE
    std::setlocale(LC_ALL, m_old_c_locale.c_str());
    s_c_locale = m_old_c_state;
+#endif
 #ifndef BOOST_NO_STD_LOCALE
    s_cpp_locale_inst = m_old_cpp_locale;
 #endif
diff --git a/test/regress/test_partial_match.hpp b/test/regress/test_partial_match.hpp
index 4ef4658f..51ae5b66 100644
--- a/test/regress/test_partial_match.hpp
+++ b/test/regress/test_partial_match.hpp
@@ -16,8 +16,8 @@
   *   DESCRIPTION: Declares tests for regex search and iteration.
   */
 
-#ifndef BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
-#define BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
+#ifndef BOOST_REGEX_REGRESS_REGEX_PARTIAL_MATCH_HPP
+#define BOOST_REGEX_REGRESS_REGEX_PARTIAL_MATCH_HPP
 #include "info.hpp"
 //
 // this file implements a test for a regular expression that should compile,
@@ -386,3 +386,4 @@ void test(boost::basic_regex<charT, traits>& r, const test_regex_search_tag&)
 
 
 #endif
+
diff --git a/test/regress/test_regex_search.hpp b/test/regress/test_regex_search.hpp
index af8182df..879ede77 100644
--- a/test/regress/test_regex_search.hpp
+++ b/test/regress/test_regex_search.hpp
@@ -19,6 +19,9 @@
 #ifndef BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
 #define BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
 #include "info.hpp"
+#ifdef TEST_ROPE
+#include <rope>
+#endif
 //
 // this file implements a test for a regular expression that should compile,
 // followed by a search for that expression:
@@ -119,6 +122,40 @@ void test_simple_search(boost::basic_regex<charT, traits>& r)
          BOOST_REGEX_TEST_ERROR("Unexpected match was found when using the match_any flag.", charT);
       }
    }
+#ifdef TEST_ROPE
+   std::rope<charT> rsearch_text;
+   for(unsigned i = 0; i < search_text.size(); ++i)
+   {
+      std::rope<charT> c(search_text[i]);
+      if(++i != search_text.size())
+      {
+         c.append(search_text[i]);
+         if(++i != search_text.size())
+         {
+            c.append(search_text[i]);
+         }
+      }
+      rsearch_text.append(c);
+   }
+   boost::match_results<std::rope<charT>::const_iterator> rwhat;
+   if(boost::regex_search(
+      rsearch_text.begin(),
+      rsearch_text.end(),
+      rwhat,
+      r,
+      opts))
+   {
+      test_result(rwhat, rsearch_text.begin(), answer_table);
+   }
+   else
+   {
+      if(answer_table[0] >= 0)
+      {
+         // we should have had a match but didn't:
+         BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+      }
+   }
+#endif
 }
 
 template<class charT, class traits>
diff --git a/test/regress/test_replace.cpp b/test/regress/test_replace.cpp
index e91b8ef6..446b6e93 100644
--- a/test/regress/test_replace.cpp
+++ b/test/regress/test_replace.cpp
@@ -55,6 +55,7 @@ void test_replace()
    TEST_REGEX_REPLACE("(A+)", perl, "...AAA,,,", match_default|format_no_copy, "\\l$1", "aAA");
    TEST_REGEX_REPLACE("(A+)", perl, "...AAA,,,", match_default|format_no_copy, "\\L$1", "aaa");
    TEST_REGEX_REPLACE("(A+)", perl, "...AAA,,,", match_default|format_no_copy, "\\L$1\\E$1", "aaaAAA");
+   TEST_REGEX_REPLACE("\\w+", perl, "fee FOO FAR bAR", match_default|format_perl, "\\L\\u$0", "Fee Foo Far Bar");
    // sed format sequences:
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\0", "aabb");
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\1", "aa");
@@ -110,7 +111,7 @@ void test_replace()
    TEST_REGEX_REPLACE("(a(c)?)|(b)", perl, "acab", match_default|format_all, "(?1(?2(C:):A):B:)", "C:AB:");
    TEST_REGEX_REPLACE("x", icase, "xx", match_default|format_all, "a", "aa");
    TEST_REGEX_REPLACE("x", basic|icase, "xx", match_default|format_all, "a", "aa");
-   TEST_REGEX_REPLACE("x", extended|icase, "xx", match_default|format_all, "a", "aa");
+   TEST_REGEX_REPLACE("x", boost::regex::extended|icase, "xx", match_default|format_all, "a", "aa");
    TEST_REGEX_REPLACE("x", emacs|icase, "xx", match_default|format_all, "a", "aa");
    TEST_REGEX_REPLACE("x", literal|icase, "xx", match_default|format_all, "a", "aa");
    // literals:
diff --git a/test/regress/test_sets.cpp b/test/regress/test_sets.cpp
index 975f2d86..61374819 100644
--- a/test/regress/test_sets.cpp
+++ b/test/regress/test_sets.cpp
@@ -19,77 +19,77 @@ void test_sets()
 {
    using namespace boost::regex_constants;
    // now test the set operator []
-   TEST_REGEX_SEARCH("[abc]", extended, "a", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[abc]", extended, "b", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[abc]", extended, "c", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[abc]", extended, "d", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("[^bcd]", extended, "a", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[^bcd]", extended, "b", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("[^bcd]", extended, "d", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("[^bcd]", extended, "e", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("a[b]c", extended, "abc", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[ab]c", extended, "abc", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[a^b]*c", extended, "aba^c", match_default, make_array(0, 5, -2, -2));
-   TEST_REGEX_SEARCH("a[^ab]c", extended, "adc", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[]b]c", extended, "a]c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[[b]c", extended, "a[c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[-b]c", extended, "a-c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[^]b]c", extended, "adc", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[^-b]c", extended, "adc", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[b-]c", extended, "a-c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[a-z-]c", extended, "a-c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[a-z-]+c", extended, "aaz-c", match_default, make_array(0, 5, -2, -2));
-   TEST_INVALID_REGEX("a[b", extended);
-   TEST_INVALID_REGEX("a[", extended);
-   TEST_INVALID_REGEX("a[]", extended);
+   TEST_REGEX_SEARCH("[abc]", boost::regex::extended, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[abc]", boost::regex::extended, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[abc]", boost::regex::extended, "c", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[abc]", boost::regex::extended, "d", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[^bcd]", boost::regex::extended, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[^bcd]", boost::regex::extended, "b", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[^bcd]", boost::regex::extended, "d", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[^bcd]", boost::regex::extended, "e", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a[b]c", boost::regex::extended, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[ab]c", boost::regex::extended, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[a^b]*c", boost::regex::extended, "aba^c", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a[^ab]c", boost::regex::extended, "adc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[]b]c", boost::regex::extended, "a]c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[[b]c", boost::regex::extended, "a[c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[-b]c", boost::regex::extended, "a-c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[^]b]c", boost::regex::extended, "adc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[^-b]c", boost::regex::extended, "adc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[b-]c", boost::regex::extended, "a-c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[a-z-]c", boost::regex::extended, "a-c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[a-z-]+c", boost::regex::extended, "aaz-c", match_default, make_array(0, 5, -2, -2));
+   TEST_INVALID_REGEX("a[b", boost::regex::extended);
+   TEST_INVALID_REGEX("a[", boost::regex::extended);
+   TEST_INVALID_REGEX("a[]", boost::regex::extended);
 
    // now some ranges:
-   TEST_REGEX_SEARCH("[b-e]", extended, "a", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("[b-e]", extended, "b", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[b-e]", extended, "e", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[b-e]", extended, "f", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("[^b-e]", extended, "a", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[^b-e]", extended, "b", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("[^b-e]", extended, "e", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("[^b-e]", extended, "f", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("a[1-3]c", extended, "a2c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[-3]c", extended, "a-c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[-3]c", extended, "a3c", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("a[^-3]c", extended, "a-c", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("a[^-3]c", extended, "a3c", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("a[^-3]c", extended, "axc", match_default, make_array(0, 3, -2, -2));
-   TEST_INVALID_REGEX("a[3-1]c", extended & ~::boost::regex_constants::collate);
-   TEST_INVALID_REGEX("a[1-3-5]c", extended);
-   TEST_INVALID_REGEX("a[1-", extended);
+   TEST_REGEX_SEARCH("[b-e]", boost::regex::extended, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[b-e]", boost::regex::extended, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[b-e]", boost::regex::extended, "e", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[b-e]", boost::regex::extended, "f", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[^b-e]", boost::regex::extended, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[^b-e]", boost::regex::extended, "b", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[^b-e]", boost::regex::extended, "e", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[^b-e]", boost::regex::extended, "f", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a[1-3]c", boost::regex::extended, "a2c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[-3]c", boost::regex::extended, "a-c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[-3]c", boost::regex::extended, "a3c", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a[^-3]c", boost::regex::extended, "a-c", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a[^-3]c", boost::regex::extended, "a3c", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a[^-3]c", boost::regex::extended, "axc", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("a[3-1]c", boost::regex::extended & ~::boost::regex_constants::collate);
+   TEST_INVALID_REGEX("a[1-3-5]c", boost::regex::extended);
+   TEST_INVALID_REGEX("a[1-", boost::regex::extended);
    TEST_INVALID_REGEX("a[\\9]", perl);
 
    // and some classes
-   TEST_REGEX_SEARCH("a[[:alpha:]]c", extended, "abc", match_default, make_array(0, 3, -2, -2));
-   TEST_INVALID_REGEX("a[[:unknown:]]c", extended);
-   TEST_INVALID_REGEX("a[[", extended);
-   TEST_INVALID_REGEX("a[[:", extended);
-   TEST_INVALID_REGEX("a[[:a", extended);
-   TEST_INVALID_REGEX("a[[:alpha", extended);
-   TEST_INVALID_REGEX("a[[:alpha:", extended);
-   TEST_INVALID_REGEX("a[[:alpha:]", extended);
-   TEST_INVALID_REGEX("a[[:alpha:!", extended);
-   TEST_INVALID_REGEX("a[[:alpha,:]", extended);
-   TEST_INVALID_REGEX("a[[:]:]]b", extended);
-   TEST_INVALID_REGEX("a[[:-:]]b", extended);
-   TEST_INVALID_REGEX("a[[:alph:]]", extended);
-   TEST_INVALID_REGEX("a[[:alphabet:]]", extended);
-   TEST_REGEX_SEARCH("[[:alnum:]]+", extended, "-%@a0X_-", match_default, make_array(3, 6, -2, -2));
-   TEST_REGEX_SEARCH("[[:alpha:]]+", extended, " -%@aX_0-", match_default, make_array(4, 6, -2, -2));
-   TEST_REGEX_SEARCH("[[:blank:]]+", extended, "a  \tb", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("[[:cntrl:]]+", extended, " a\n\tb", match_default, make_array(2, 4, -2, -2));
-   TEST_REGEX_SEARCH("[[:digit:]]+", extended, "a019b", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("[[:graph:]]+", extended, " a%b ", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("[[:lower:]]+", extended, "AabC", match_default, make_array(1, 3, -2, -2));
-   TEST_REGEX_SEARCH("[[:print:]]+", extended, "AabC", match_default, make_array(0, 4, -2, -2));
-   TEST_REGEX_SEARCH("[[:punct:]]+", extended, " %-&\t", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("[[:space:]]+", extended, "a \n\t\rb", match_default, make_array(1, 5, -2, -2));
-   TEST_REGEX_SEARCH("[[:upper:]]+", extended, "aBCd", match_default, make_array(1, 3, -2, -2));
-   TEST_REGEX_SEARCH("[[:xdigit:]]+", extended, "p0f3Cx", match_default, make_array(1, 5, -2, -2));
+   TEST_REGEX_SEARCH("a[[:alpha:]]c", boost::regex::extended, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("a[[:unknown:]]c", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:a", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:alpha", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:alpha:", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:alpha:]", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:alpha:!", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:alpha,:]", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:]:]]b", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:-:]]b", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:alph:]]", boost::regex::extended);
+   TEST_INVALID_REGEX("a[[:alphabet:]]", boost::regex::extended);
+   TEST_REGEX_SEARCH("[[:alnum:]]+", boost::regex::extended, "-%@a0X_-", match_default, make_array(3, 6, -2, -2));
+   TEST_REGEX_SEARCH("[[:alpha:]]+", boost::regex::extended, " -%@aX_0-", match_default, make_array(4, 6, -2, -2));
+   TEST_REGEX_SEARCH("[[:blank:]]+", boost::regex::extended, "a  \tb", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("[[:cntrl:]]+", boost::regex::extended, " a\n\tb", match_default, make_array(2, 4, -2, -2));
+   TEST_REGEX_SEARCH("[[:digit:]]+", boost::regex::extended, "a019b", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("[[:graph:]]+", boost::regex::extended, " a%b ", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:]]+", boost::regex::extended, "AabC", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("[[:print:]]+", boost::regex::extended, "AabC", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("[[:punct:]]+", boost::regex::extended, " %-&\t", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("[[:space:]]+", boost::regex::extended, "a \n\t\rb", match_default, make_array(1, 5, -2, -2));
+   TEST_REGEX_SEARCH("[[:upper:]]+", boost::regex::extended, "aBCd", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("[[:xdigit:]]+", boost::regex::extended, "p0f3Cx", match_default, make_array(1, 5, -2, -2));
    TEST_REGEX_SEARCH("[\\d]+", perl, "a019b", match_default, make_array(1, 4, -2, -2));
 
    //
@@ -155,11 +155,11 @@ void test_sets2()
    TEST_REGEX_SEARCH("[[.right-curly-bracket.]]", perl, "}", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.NUL.]]", perl, "\0", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.NUL.][.ae.]]", perl, "\0", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[[.NUL.]-a]", extended, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.NUL.]-a]", boost::regex::extended, "\0", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.NUL.]-a]", perl, "\0", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[[.NUL.]-a]", extended, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.NUL.]-a]", boost::regex::extended, "a", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.NUL.]-a]", perl, "a", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[[.NUL.]-[.NUL.]a]", extended, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.NUL.]-[.NUL.]a]", boost::regex::extended, "a", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.NUL.]-[.NUL.]a]", perl, "a", match_default, make_array(0, 1, -2, -2));
    TEST_INVALID_REGEX("[[..]]", perl);
    TEST_INVALID_REGEX("[[.not-a-collating-element.]]", perl);
@@ -170,19 +170,19 @@ void test_sets2()
    TEST_INVALID_REGEX("[[.NUL.]", perl);
    TEST_INVALID_REGEX("[[:<:]z]", perl);
    TEST_INVALID_REGEX("[a[:>:]]", perl);
-   TEST_REGEX_SEARCH("[[.A.]]", extended|icase, "A", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[[.A.]]", extended|icase, "a", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[[.A.]-b]+", extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
-   TEST_REGEX_SEARCH("[A-[.b.]]+", extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
-   TEST_REGEX_SEARCH("[[.a.]-B]+", extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
-   TEST_REGEX_SEARCH("[a-[.B.]]+", extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
-   TEST_REGEX_SEARCH("[\x61]", extended, "a", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[\x61-c]+", extended, "abcd", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("[a-\x63]+", extended, "abcd", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("[[.a.]-c]+", extended, "abcd", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("[a-[.c.]]+", extended, "abcd", match_default, make_array(0, 3, -2, -2));
-   TEST_INVALID_REGEX("[[:alpha:]-a]", extended);
-   TEST_INVALID_REGEX("[a-[:alpha:]]", extended);
+   TEST_REGEX_SEARCH("[[.A.]]", boost::regex::extended|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.A.]]", boost::regex::extended|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.A.]-b]+", boost::regex::extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("[A-[.b.]]+", boost::regex::extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("[[.a.]-B]+", boost::regex::extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("[a-[.B.]]+", boost::regex::extended|icase, "AaBb", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("[\x61]", boost::regex::extended, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[\x61-c]+", boost::regex::extended, "abcd", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("[a-\x63]+", boost::regex::extended, "abcd", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("[[.a.]-c]+", boost::regex::extended, "abcd", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("[a-[.c.]]+", boost::regex::extended, "abcd", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("[[:alpha:]-a]", boost::regex::extended);
+   TEST_INVALID_REGEX("[a-[:alpha:]]", boost::regex::extended);
    TEST_REGEX_SEARCH("[[.ae.]]", basic, "ae", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("[[.ae.]]", basic, "aE", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("[[.AE.]]", basic, "AE", match_default, make_array(0, 2, -2, -2));
@@ -339,64 +339,64 @@ void test_sets2b()
 {
    using namespace boost::regex_constants;
 
-   // and repeat with POSIX-extended syntax:
-   TEST_REGEX_SEARCH("\\pl+", extended, "ABabcAB", match_default, make_array(2, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\Pl+", extended, "abABCab", match_default, make_array(2, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\pu+", extended, "abABCab", match_default, make_array(2, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\Pu+", extended, "ABabcAB", match_default, make_array(2, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\pd+", extended, "AB012AB", match_default, make_array(2, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\PD+", extended, "01abc01", match_default, make_array(2, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\ps+", extended, "AB   AB", match_default, make_array(2, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\PS+", extended, "  abc  ", match_default, make_array(2, 5, -2, -2));
+   // and repeat with POSIX-boost::regex::extended syntax:
+   TEST_REGEX_SEARCH("\\pl+", boost::regex::extended, "ABabcAB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\Pl+", boost::regex::extended, "abABCab", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\pu+", boost::regex::extended, "abABCab", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\Pu+", boost::regex::extended, "ABabcAB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\pd+", boost::regex::extended, "AB012AB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\PD+", boost::regex::extended, "01abc01", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\ps+", boost::regex::extended, "AB   AB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\PS+", boost::regex::extended, "  abc  ", match_default, make_array(2, 5, -2, -2));
 
-   TEST_REGEX_SEARCH("\\p{alnum}+", extended, "-%@a0X_-", match_default, make_array(3, 6, -2, -2));
-   TEST_REGEX_SEARCH("\\p{alpha}+", extended, " -%@aX_0-", match_default, make_array(4, 6, -2, -2));
-   TEST_REGEX_SEARCH("\\p{blank}+", extended, "a  \tb", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("\\p{cntrl}+", extended, " a\n\tb", match_default, make_array(2, 4, -2, -2));
-   TEST_REGEX_SEARCH("\\p{digit}+", extended, "a019b", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("\\p{graph}+", extended, " a%b ", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("\\p{lower}+", extended, "AabC", match_default, make_array(1, 3, -2, -2));
-   TEST_REGEX_SEARCH("\\p{print}+", extended, "AabC", match_default, make_array(0, 4, -2, -2));
-   TEST_REGEX_SEARCH("\\p{punct}+", extended, " %-&\t", match_default, make_array(1, 4, -2, -2));
-   TEST_REGEX_SEARCH("\\p{space}+", extended, "a \n\t\rb", match_default, make_array(1, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\p{upper}+", extended, "aBCd", match_default, make_array(1, 3, -2, -2));
-   TEST_REGEX_SEARCH("\\p{xdigit}+", extended, "p0f3Cx", match_default, make_array(1, 5, -2, -2));
-   TEST_REGEX_SEARCH("\\P{alnum}+", extended, "-%@a", match_default, make_array(0, 3, -2, -2));
-   TEST_REGEX_SEARCH("\\P{alpha}+", extended, " -%@a", match_default, make_array(0, 4, -2, -2));
-   TEST_REGEX_SEARCH("\\P{blank}+", extended, "a  ", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\P{cntrl}+", extended, " a\n", match_default, make_array(0, 2, -2, -2));
-   TEST_REGEX_SEARCH("\\P{digit}+", extended, "a0", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\P{graph}+", extended, " a", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\P{lower}+", extended, "Aa", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\P{print}+", extended, "Absc", match_default, make_array(-2, -2));
-   TEST_REGEX_SEARCH("\\P{punct}+", extended, " %", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\P{space}+", extended, "a ", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\P{upper}+", extended, "aB", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\P{xdigit}+", extended, "pf", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\p{alnum}+", boost::regex::extended, "-%@a0X_-", match_default, make_array(3, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\p{alpha}+", boost::regex::extended, " -%@aX_0-", match_default, make_array(4, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\p{blank}+", boost::regex::extended, "a  \tb", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{cntrl}+", boost::regex::extended, " a\n\tb", match_default, make_array(2, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{digit}+", boost::regex::extended, "a019b", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{graph}+", boost::regex::extended, " a%b ", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{lower}+", boost::regex::extended, "AabC", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\p{print}+", boost::regex::extended, "AabC", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{punct}+", boost::regex::extended, " %-&\t", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{space}+", boost::regex::extended, "a \n\t\rb", match_default, make_array(1, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\p{upper}+", boost::regex::extended, "aBCd", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\p{xdigit}+", boost::regex::extended, "p0f3Cx", match_default, make_array(1, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\P{alnum}+", boost::regex::extended, "-%@a", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\P{alpha}+", boost::regex::extended, " -%@a", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\P{blank}+", boost::regex::extended, "a  ", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{cntrl}+", boost::regex::extended, " a\n", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\P{digit}+", boost::regex::extended, "a0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{graph}+", boost::regex::extended, " a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{lower}+", boost::regex::extended, "Aa", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{print}+", boost::regex::extended, "Absc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\P{punct}+", boost::regex::extended, " %", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{space}+", boost::regex::extended, "a ", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{upper}+", boost::regex::extended, "aB", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{xdigit}+", boost::regex::extended, "pf", match_default, make_array(0, 1, -2, -2));
 
-   TEST_INVALID_REGEX("\\p{invalid class}", extended);
-   TEST_INVALID_REGEX("\\p{upper", extended);
-   TEST_INVALID_REGEX("\\p{", extended);
-   TEST_INVALID_REGEX("\\p", extended);
-   TEST_INVALID_REGEX("\\P{invalid class}", extended);
-   TEST_INVALID_REGEX("\\P{upper", extended);
-   TEST_INVALID_REGEX("\\P{", extended);
-   TEST_INVALID_REGEX("\\P", extended);
+   TEST_INVALID_REGEX("\\p{invalid class}", boost::regex::extended);
+   TEST_INVALID_REGEX("\\p{upper", boost::regex::extended);
+   TEST_INVALID_REGEX("\\p{", boost::regex::extended);
+   TEST_INVALID_REGEX("\\p", boost::regex::extended);
+   TEST_INVALID_REGEX("\\P{invalid class}", boost::regex::extended);
+   TEST_INVALID_REGEX("\\P{upper", boost::regex::extended);
+   TEST_INVALID_REGEX("\\P{", boost::regex::extended);
+   TEST_INVALID_REGEX("\\P", boost::regex::extended);
 
    // try named characters:
-   TEST_REGEX_SEARCH("\\N{zero}", extended, "0", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\N{one}", extended, "1", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\N{two}", extended, "2", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\N{three}", extended, "3", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\N{a}", extended, "bac", match_default, make_array(1, 2, -2, -2));
-   TEST_REGEX_SEARCH("\\N{\xf0}", extended, "b\xf0x", match_default, make_array(1, 2, -2, -2));
-   TEST_REGEX_SEARCH("\\N{right-curly-bracket}", extended, "}", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("\\N{NUL}", extended, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{zero}", boost::regex::extended, "0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{one}", boost::regex::extended, "1", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{two}", boost::regex::extended, "2", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{three}", boost::regex::extended, "3", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{a}", boost::regex::extended, "bac", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\N{\xf0}", boost::regex::extended, "b\xf0x", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\N{right-curly-bracket}", boost::regex::extended, "}", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{NUL}", boost::regex::extended, "\0", match_default, make_array(0, 1, -2, -2));
 
-   TEST_INVALID_REGEX("\\N", extended);
-   TEST_INVALID_REGEX("\\N{", extended);
-   TEST_INVALID_REGEX("\\N{}", extended);
-   TEST_INVALID_REGEX("\\N{invalid-name}", extended);
-   TEST_INVALID_REGEX("\\N{zero", extended);
+   TEST_INVALID_REGEX("\\N", boost::regex::extended);
+   TEST_INVALID_REGEX("\\N{", boost::regex::extended);
+   TEST_INVALID_REGEX("\\N{}", boost::regex::extended);
+   TEST_INVALID_REGEX("\\N{invalid-name}", boost::regex::extended);
+   TEST_INVALID_REGEX("\\N{zero", boost::regex::extended);
 }
 
diff --git a/test/regress/test_simple_repeats.cpp b/test/regress/test_simple_repeats.cpp
index 3e0aecfe..6811e5f9 100644
--- a/test/regress/test_simple_repeats.cpp
+++ b/test/regress/test_simple_repeats.cpp
@@ -40,12 +40,12 @@ void test_simple_repeats()
    TEST_REGEX_SEARCH("(ab)*", perl, "abab", match_default, make_array(0, 4, 2, 4, -2, 4, 4, -2, -2));
 
    TEST_INVALID_REGEX("(*)", perl);
-   TEST_INVALID_REGEX("(*)", extended);
+   TEST_INVALID_REGEX("(*)", boost::regex::extended);
    TEST_INVALID_REGEX("\\(*\\)", basic);
    TEST_INVALID_REGEX("^*", perl);
-   TEST_INVALID_REGEX("^*", extended);
+   TEST_INVALID_REGEX("^*", boost::regex::extended);
    TEST_INVALID_REGEX("$*", perl);
-   TEST_INVALID_REGEX("$*", extended);
+   TEST_INVALID_REGEX("$*", boost::regex::extended);
    TEST_INVALID_REGEX("$*", basic);
    TEST_INVALID_REGEX("\\b*", perl);
    TEST_INVALID_REGEX("\\B*", perl);
@@ -54,13 +54,13 @@ void test_simple_repeats()
    TEST_INVALID_REGEX("\\Z*", perl);
    TEST_INVALID_REGEX("\\A*", perl);
    TEST_INVALID_REGEX("a|*", perl);
-   TEST_INVALID_REGEX("a|*", extended);
+   TEST_INVALID_REGEX("a|*", boost::regex::extended);
    TEST_INVALID_REGEX("(+)", perl);
-   TEST_INVALID_REGEX("(+)", extended);
+   TEST_INVALID_REGEX("(+)", boost::regex::extended);
    TEST_INVALID_REGEX("^+", perl);
-   TEST_INVALID_REGEX("^+", extended);
+   TEST_INVALID_REGEX("^+", boost::regex::extended);
    TEST_INVALID_REGEX("$+", perl);
-   TEST_INVALID_REGEX("$+", extended);
+   TEST_INVALID_REGEX("$+", boost::regex::extended);
    TEST_INVALID_REGEX("\\b+", perl);
    TEST_INVALID_REGEX("\\B+", perl);
    TEST_INVALID_REGEX("\\A+", perl);
@@ -68,13 +68,13 @@ void test_simple_repeats()
    TEST_INVALID_REGEX("\\Z+", perl);
    TEST_INVALID_REGEX("\\A+", perl);
    TEST_INVALID_REGEX("a|+", perl);
-   TEST_INVALID_REGEX("a|+", extended);
+   TEST_INVALID_REGEX("a|+", boost::regex::extended);
    TEST_INVALID_REGEX("(?)", perl);
-   TEST_INVALID_REGEX("(?)", extended);
+   TEST_INVALID_REGEX("(?)", boost::regex::extended);
    TEST_INVALID_REGEX("^?", perl);
-   TEST_INVALID_REGEX("^?", extended);
+   TEST_INVALID_REGEX("^?", boost::regex::extended);
    TEST_INVALID_REGEX("$?", perl);
-   TEST_INVALID_REGEX("$?", extended);
+   TEST_INVALID_REGEX("$?", boost::regex::extended);
    TEST_INVALID_REGEX("\\b?", perl);
    TEST_INVALID_REGEX("\\B?", perl);
    TEST_INVALID_REGEX("\\A?", perl);
@@ -82,13 +82,13 @@ void test_simple_repeats()
    TEST_INVALID_REGEX("\\Z?", perl);
    TEST_INVALID_REGEX("\\A?", perl);
    TEST_INVALID_REGEX("a|?", perl);
-   TEST_INVALID_REGEX("a|?", extended);
+   TEST_INVALID_REGEX("a|?", boost::regex::extended);
    TEST_INVALID_REGEX("({1,2})", perl);
-   TEST_INVALID_REGEX("({1,2})", extended);
+   TEST_INVALID_REGEX("({1,2})", boost::regex::extended);
    TEST_INVALID_REGEX("^{1,2}", perl);
-   TEST_INVALID_REGEX("^{1,2}", extended);
+   TEST_INVALID_REGEX("^{1,2}", boost::regex::extended);
    TEST_INVALID_REGEX("${1,2}", perl);
-   TEST_INVALID_REGEX("${1,2}", extended);
+   TEST_INVALID_REGEX("${1,2}", boost::regex::extended);
    TEST_INVALID_REGEX("\\b{1,2}", perl);
    TEST_INVALID_REGEX("\\B{1,2}", perl);
    TEST_INVALID_REGEX("\\A{1,2}", perl);
@@ -96,7 +96,7 @@ void test_simple_repeats()
    TEST_INVALID_REGEX("\\Z{1,2}", perl);
    TEST_INVALID_REGEX("\\A{1,2}", perl);
    TEST_INVALID_REGEX("a|{1,2}", perl);
-   TEST_INVALID_REGEX("a|{1,2}", extended);
+   TEST_INVALID_REGEX("a|{1,2}", boost::regex::extended);
 
    // now try operator + :
    TEST_REGEX_SEARCH("ab+", perl, "a", match_default, make_array(-2, -2));
diff --git a/test/regress/test_tricky_cases.cpp b/test/regress/test_tricky_cases.cpp
index 609f4e61..a0c1e532 100644
--- a/test/regress/test_tricky_cases.cpp
+++ b/test/regress/test_tricky_cases.cpp
@@ -134,92 +134,92 @@ void test_tricky_cases2()
 {
    using namespace boost::regex_constants;
    
-   TEST_REGEX_SEARCH("a(((b)))c", extended, "abc", match_default, make_array(0, 3, 1, 2, 1, 2, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b|(c))d", extended, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|(c))d", extended, "acd", match_default, make_array(0, 3, 1, 2, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b*|c)d", extended, "abbd", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(((b)))c", boost::regex::extended, "abc", match_default, make_array(0, 3, 1, 2, 1, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", boost::regex::extended, "acd", match_default, make_array(0, 3, 1, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c)d", boost::regex::extended, "abbd", match_default, make_array(0, 4, 1, 3, -2, -2));
    // just gotta have one DFA-buster, of course
-   TEST_REGEX_SEARCH("a[ab]{20}", extended, "aaaaabaaaabaaaabaaaab", match_default, make_array(0, 21, -2, -2));
+   TEST_REGEX_SEARCH("a[ab]{20}", boost::regex::extended, "aaaaabaaaabaaaabaaaab", match_default, make_array(0, 21, -2, -2));
    // and an inline expansion in case somebody gets tricky
-   TEST_REGEX_SEARCH("a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab]", extended, "aaaaabaaaabaaaabaaaab", match_default, make_array(0, 21, -2, -2));
+   TEST_REGEX_SEARCH("a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab]", boost::regex::extended, "aaaaabaaaabaaaabaaaab", match_default, make_array(0, 21, -2, -2));
    // and in case somebody just slips in an NFA...
-   TEST_REGEX_SEARCH("a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night)", extended, "aaaaabaaaabaaaabaaaabweeknights", match_default, make_array(0, 31, 21, 24, 24, 31, -2, -2));
+   TEST_REGEX_SEARCH("a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night)", boost::regex::extended, "aaaaabaaaabaaaabaaaabweeknights", match_default, make_array(0, 31, 21, 24, 24, 31, -2, -2));
    // one really big one
-   TEST_REGEX_SEARCH("1234567890123456789012345678901234567890123456789012345678901234567890", extended, "a1234567890123456789012345678901234567890123456789012345678901234567890b", match_default, make_array(1, 71, -2, -2));
+   TEST_REGEX_SEARCH("1234567890123456789012345678901234567890123456789012345678901234567890", boost::regex::extended, "a1234567890123456789012345678901234567890123456789012345678901234567890b", match_default, make_array(1, 71, -2, -2));
    // fish for problems as brackets go past 8
-   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn]", extended, "xacegikmoq", match_default, make_array(1, 8, -2, -2));
-   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op]", extended, "xacegikmoq", match_default, make_array(1, 9, -2, -2));
-   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op][qr]", extended, "xacegikmoqy", match_default, make_array(1, 10, -2, -2));
-   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op][q]", extended, "xacegikmoqy", match_default, make_array(1, 10, -2, -2));
+   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn]", boost::regex::extended, "xacegikmoq", match_default, make_array(1, 8, -2, -2));
+   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op]", boost::regex::extended, "xacegikmoq", match_default, make_array(1, 9, -2, -2));
+   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op][qr]", boost::regex::extended, "xacegikmoqy", match_default, make_array(1, 10, -2, -2));
+   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op][q]", boost::regex::extended, "xacegikmoqy", match_default, make_array(1, 10, -2, -2));
    // and as parenthesis go past 9:
-   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)", extended, "zabcdefghi", match_default, make_array(1, 9, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, -2, -2));
-   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)(i)", extended, "zabcdefghij", match_default, make_array(1, 10, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, -2, -2));
-   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)", extended, "zabcdefghijk", match_default, make_array(1, 11, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, -2, -2));
-   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)", extended, "zabcdefghijkl", match_default, make_array(1, 12, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, -2, -2));
-   TEST_REGEX_SEARCH("(a)d|(b)c", extended, "abc", match_default, make_array(1, 3, -1, -1, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("_+((www)|(ftp)|(mailto)):_*", extended, "_wwwnocolon _mailto:", match_default, make_array(12, 20, 13, 19, -1, -1, -1, -1, 13, 19, -2, -2));
+   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)", boost::regex::extended, "zabcdefghi", match_default, make_array(1, 9, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, -2, -2));
+   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)(i)", boost::regex::extended, "zabcdefghij", match_default, make_array(1, 10, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, -2, -2));
+   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)", boost::regex::extended, "zabcdefghijk", match_default, make_array(1, 11, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, -2, -2));
+   TEST_REGEX_SEARCH("(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)", boost::regex::extended, "zabcdefghijkl", match_default, make_array(1, 12, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, -2, -2));
+   TEST_REGEX_SEARCH("(a)d|(b)c", boost::regex::extended, "abc", match_default, make_array(1, 3, -1, -1, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("_+((www)|(ftp)|(mailto)):_*", boost::regex::extended, "_wwwnocolon _mailto:", match_default, make_array(12, 20, 13, 19, -1, -1, -1, -1, 13, 19, -2, -2));
    // subtleties of matching
    TEST_REGEX_SEARCH("a\\(b\\)\\?c\\1d", basic|bk_plus_qm, "acd", match_default, make_array(0, 3, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b?c)+d", extended, "accd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("(wee|week)(knights|night)", extended, "weeknights", match_default, make_array(0, 10, 0, 3, 3, 10, -2, -2));
-   TEST_REGEX_SEARCH(".*", extended, "abc", match_default, make_array(0, 3, -2, 3, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|(c))d", extended, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|(c))d", extended, "acd", match_default, make_array(0, 3, 1, 2, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b*|c|e)d", extended, "abbd", match_default, make_array(0, 4, 1, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b*|c|e)d", extended, "acd", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b*|c|e)d", extended, "ad", match_default, make_array(0, 2, 1, 1, -2, -2));
-   TEST_REGEX_SEARCH("a(b?)c", extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b?)c", extended, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
-   TEST_REGEX_SEARCH("a(b+)c", extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b+)c", extended, "abbbc", match_default, make_array(0, 5, 1, 4, -2, -2));
-   TEST_REGEX_SEARCH("a(b*)c", extended, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
-   TEST_REGEX_SEARCH("(a|ab)(bc([de]+)f|cde)", extended, "abcdef", match_default, make_array(0, 6, 0, 1, 1, 6, 3, 5, -2, -2));
-   TEST_REGEX_SEARCH("a([bc]?)c", extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a([bc]?)c", extended, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
-   TEST_REGEX_SEARCH("a([bc]+)c", extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a([bc]+)c", extended, "abcc", match_default, make_array(0, 4, 1, 3, -2, -2));
-   TEST_REGEX_SEARCH("a([bc]+)bc", extended, "abcbc", match_default, make_array(0, 5, 1, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(bb+|b)b", extended, "abb", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", extended, "abb", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", extended, "abbb", match_default, make_array(0, 4, 1, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(bbb+|bb+|b)bb", extended, "abbb", match_default, make_array(0, 4, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("(.*).*", extended, "abcdef", match_default, make_array(0, 6, 0, 6, -2, 6, 6, 6, 6, -2, -2));
-   TEST_REGEX_SEARCH("(a*)*", extended, "bc", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, 2, 2, 2, 2, -2, -2));
-   TEST_REGEX_SEARCH("xyx*xz", extended, "xyxxxxyxxxz", match_default, make_array(5, 11, -2, -2));
+   TEST_REGEX_SEARCH("a(b?c)+d", boost::regex::extended, "accd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("(wee|week)(knights|night)", boost::regex::extended, "weeknights", match_default, make_array(0, 10, 0, 3, 3, 10, -2, -2));
+   TEST_REGEX_SEARCH(".*", boost::regex::extended, "abc", match_default, make_array(0, 3, -2, 3, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", boost::regex::extended, "acd", match_default, make_array(0, 3, 1, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", boost::regex::extended, "abbd", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", boost::regex::extended, "acd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", boost::regex::extended, "ad", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", boost::regex::extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", boost::regex::extended, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", boost::regex::extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", boost::regex::extended, "abbbc", match_default, make_array(0, 5, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(b*)c", boost::regex::extended, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a|ab)(bc([de]+)f|cde)", boost::regex::extended, "abcdef", match_default, make_array(0, 6, 0, 1, 1, 6, 3, 5, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", boost::regex::extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", boost::regex::extended, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)c", boost::regex::extended, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)c", boost::regex::extended, "abcc", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)bc", boost::regex::extended, "abcbc", match_default, make_array(0, 5, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bb+|b)b", boost::regex::extended, "abb", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", boost::regex::extended, "abb", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", boost::regex::extended, "abbb", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)bb", boost::regex::extended, "abbb", match_default, make_array(0, 4, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("(.*).*", boost::regex::extended, "abcdef", match_default, make_array(0, 6, 0, 6, -2, 6, 6, 6, 6, -2, -2));
+   TEST_REGEX_SEARCH("(a*)*", boost::regex::extended, "bc", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, 2, 2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("xyx*xz", boost::regex::extended, "xyxxxxyxxxz", match_default, make_array(5, 11, -2, -2));
    // do we get the right subexpression when it is used more than once?
-   TEST_REGEX_SEARCH("a(b|c)*d", extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c)*d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c)+d", extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c)+d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c?)+d", extended, "ad", match_default, make_array(0, 2, 1, 1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){0,0}d", extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){0,1}d", extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){0,1}d", extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){0,2}d", extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){0,2}d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){0,}d", extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){0,}d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){1,1}d", extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){1,2}d", extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){1,2}d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){1,}d", extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){1,}d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){2,2}d", extended, "acbd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){2,2}d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){2,4}d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){2,4}d", extended, "abcbd", match_default, make_array(0, 5, 3, 4, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){2,4}d", extended, "abcbcd", match_default, make_array(0, 6, 4, 5, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){2,}d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|c){2,}d", extended, "abcbd", match_default, make_array(0, 5, 3, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)*d", boost::regex::extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)*d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)+d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)+d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c?)+d", boost::regex::extended, "ad", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,0}d", boost::regex::extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,1}d", boost::regex::extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,1}d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,2}d", boost::regex::extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,2}d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,}d", boost::regex::extended, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,}d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,1}d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,2}d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,2}d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,}d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,}d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,2}d", boost::regex::extended, "acbd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,2}d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,4}d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,4}d", boost::regex::extended, "abcbd", match_default, make_array(0, 5, 3, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,4}d", boost::regex::extended, "abcbcd", match_default, make_array(0, 6, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,}d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,}d", boost::regex::extended, "abcbd", match_default, make_array(0, 5, 3, 4, -2, -2));
    // perl only:
    TEST_REGEX_SEARCH("a(b|c?)+d", perl, "abcd", match_default, make_array(0, 4, 3, 3, -2, -2));
    TEST_REGEX_SEARCH("a(b+|((c)*))+d", perl, "abd", match_default, make_array(0, 3, 2, 2, 2, 2, -1, -1, -2, -2));
    TEST_REGEX_SEARCH("a(b+|((c)*))+d", perl, "abcd", match_default, make_array(0, 4, 3, 3, 3, 3, 2, 3, -2, -2));
    // posix only:
-   TEST_REGEX_SEARCH("a(b|c?)+d", extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b|((c)*))+d", extended, "abcd", match_default, make_array(0, 4, 2, 3, 2, 3, 2, 3, -2, -2));
-   TEST_REGEX_SEARCH("a(b+|((c)*))+d", extended, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("a(b+|((c)*))+d", extended, "abcd", match_default, make_array(0, 4, 2, 3, 2, 3, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c?)+d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|((c)*))+d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, 2, 3, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b+|((c)*))+d", boost::regex::extended, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b+|((c)*))+d", boost::regex::extended, "abcd", match_default, make_array(0, 4, 2, 3, 2, 3, 2, 3, -2, -2));
    // literals:
    TEST_REGEX_SEARCH("\\**?/{}", literal, "\\**?/{}", match_default, make_array(0, 7, -2, -2));
    TEST_REGEX_SEARCH("\\**?/{}", literal, "\\**?/{", match_default, make_array(-2, -2));
@@ -238,27 +238,27 @@ void test_tricky_cases2()
    TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", perl, "#define some_symbol(x) #x", match_default, make_array(0, 25, -1, -1, -2, -2));
    // try to match C++ syntax elements:
    // line comment:
-   TEST_REGEX_SEARCH("//[^\\n]*", extended&~no_escape_in_lists, "++i //here is a line comment\n", match_default, make_array(4, 28, -2, -2));
+   TEST_REGEX_SEARCH("//[^\\n]*", boost::regex::extended&~no_escape_in_lists, "++i //here is a line comment\n", match_default, make_array(4, 28, -2, -2));
    // block comment:
-   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", extended&~no_escape_in_lists, "/* here is a block comment */", match_default, make_array(0, 29, 26, 27, -2, -2));
-   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", extended&~no_escape_in_lists, "/**/", match_default, make_array(0, 4, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", extended&~no_escape_in_lists, "/***/", match_default, make_array(0, 5, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", extended&~no_escape_in_lists, "/****/", match_default, make_array(0, 6, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", extended&~no_escape_in_lists, "/*****/", match_default, make_array(0, 7, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", extended&~no_escape_in_lists, "/*****/*/", match_default, make_array(0, 7, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", boost::regex::extended&~no_escape_in_lists, "/* here is a block comment */", match_default, make_array(0, 29, 26, 27, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", boost::regex::extended&~no_escape_in_lists, "/**/", match_default, make_array(0, 4, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", boost::regex::extended&~no_escape_in_lists, "/***/", match_default, make_array(0, 5, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", boost::regex::extended&~no_escape_in_lists, "/****/", match_default, make_array(0, 6, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", boost::regex::extended&~no_escape_in_lists, "/*****/", match_default, make_array(0, 7, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", boost::regex::extended&~no_escape_in_lists, "/*****/*/", match_default, make_array(0, 7, -1, -1, -2, -2));
    // preprossor directives:
-   TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", extended&~no_escape_in_lists, "#define some_symbol", match_default, make_array(0, 19, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", extended&~no_escape_in_lists, "#define some_symbol(x) #x", match_default, make_array(0, 25, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", boost::regex::extended&~no_escape_in_lists, "#define some_symbol", match_default, make_array(0, 19, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", boost::regex::extended&~no_escape_in_lists, "#define some_symbol(x) #x", match_default, make_array(0, 25, -1, -1, -2, -2));
    // perl only:
    TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", perl, "#define some_symbol(x) \\  \r\n  foo();\\\r\n   printf(#x);", match_default, make_array(0, 53, 30, 42, -2, -2));
    // POSIX leftmost longest checks:
-   TEST_REGEX_SEARCH("(aaa)|(\\w+)", extended&~no_escape_in_lists, "a", match_default, make_array(0, 1, -1, -1, 0, 1, -2, -2));
-   TEST_REGEX_SEARCH("(aaa)|(\\w+)", extended&~no_escape_in_lists, "aa", match_default, make_array(0, 2, -1, -1, 0, 2, -2, -2));
-   TEST_REGEX_SEARCH("(aaa)|(\\w+)", extended&~no_escape_in_lists, "aaa", match_default, make_array(0, 3, 0, 3, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("(aaa)|(\\w+)", extended&~no_escape_in_lists, "aaaa", match_default, make_array(0, 4, -1, -1, 0, 4, -2, -2));
-   TEST_REGEX_SEARCH("($)|(\\>)", extended&~no_escape_in_lists, "aaaa", match_default, make_array(4, 4, 4, 4, -1, -1, -2, -2));
-   TEST_REGEX_SEARCH("($)|(\\>)", extended&~no_escape_in_lists, "aaaa", match_default|match_not_eol, make_array(4, 4, -1, -1, 4, 4, -2, -2));
-   TEST_REGEX_SEARCH("(aaa)(ab)*", extended, "aaaabab", match_default, make_array(0, 7, 0, 3, 5, 7, -2, -2));
+   TEST_REGEX_SEARCH("(aaa)|(\\w+)", boost::regex::extended&~no_escape_in_lists, "a", match_default, make_array(0, 1, -1, -1, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(aaa)|(\\w+)", boost::regex::extended&~no_escape_in_lists, "aa", match_default, make_array(0, 2, -1, -1, 0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(aaa)|(\\w+)", boost::regex::extended&~no_escape_in_lists, "aaa", match_default, make_array(0, 3, 0, 3, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("(aaa)|(\\w+)", boost::regex::extended&~no_escape_in_lists, "aaaa", match_default, make_array(0, 4, -1, -1, 0, 4, -2, -2));
+   TEST_REGEX_SEARCH("($)|(\\>)", boost::regex::extended&~no_escape_in_lists, "aaaa", match_default, make_array(4, 4, 4, 4, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("($)|(\\>)", boost::regex::extended&~no_escape_in_lists, "aaaa", match_default|match_not_eol, make_array(4, 4, -1, -1, 4, 4, -2, -2));
+   TEST_REGEX_SEARCH("(aaa)(ab)*", boost::regex::extended, "aaaabab", match_default, make_array(0, 7, 0, 3, 5, 7, -2, -2));
 }
 
 void test_tricky_cases3()
diff --git a/test/static_mutex/static_mutex_test.cpp b/test/static_mutex/static_mutex_test.cpp
index 14c5379b..72a8cd49 100644
--- a/test/static_mutex/static_mutex_test.cpp
+++ b/test/static_mutex/static_mutex_test.cpp
@@ -163,19 +163,44 @@ int main()
 {
    BOOST_TEST(0 != &up1);
    
-   boost::thread thrd1(&thread1_proc);
-   boost::thread thrd2(&thread1_proc);
-   boost::thread thrd3(&thread2_proc);
-   boost::thread thrd4(&thread2_proc);
-   boost::thread thrd5(&thread3_proc);
-   boost::thread thrd6(&thread3_proc);
+   std::list<boost::shared_ptr<boost::thread> > threads;
+   for(int i = 0; i < 2; ++i)
+   {
+      try{
+         threads.push_back(boost::shared_ptr<boost::thread>(new boost::thread(&thread1_proc)));
+      }
+      catch(const std::exception& e)
+      {
+         std::cerr << "<note>Thread creation failed with message: " << e.what() << "</note>" << std::endl;
+      }
+   }
+   for(int i = 0; i < 2; ++i)
+   {
+      try{
+         threads.push_back(boost::shared_ptr<boost::thread>(new boost::thread(&thread2_proc)));
+      }
+      catch(const std::exception& e)
+      {
+         std::cerr << "<note>Thread creation failed with message: " << e.what() << "</note>" << std::endl;
+      }
+   }
+   for(int i = 0; i < 2; ++i)
+   {
+      try{
+         threads.push_back(boost::shared_ptr<boost::thread>(new boost::thread(&thread3_proc)));
+      }
+      catch(const std::exception& e)
+      {
+         std::cerr << "<note>Thread creation failed with message: " << e.what() << "</note>" << std::endl;
+      }
+   }
 
-   thrd1.join();
-   thrd2.join();
-   thrd3.join();
-   thrd4.join();
-   thrd5.join();
-   thrd6.join();
+   std::list<boost::shared_ptr<boost::thread> >::const_iterator a(threads.begin()), b(threads.end());
+   while(a != b)
+   {
+      (*a)->join();
+      ++a;
+   }
 
    return total_failures;
 }